IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-16 18:25:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changing the caching mechanism to allow it to store at particular level.

Browse Source 
Some data will be applicable to parent level, even though - it has
been fetched it from a particular node.

i.e.
roles will be applicable to server level (not particular role level).
This commit is contained in:
Ashesh Vashi 2016-01-05 14:36:30 +05:30
parent 9f8a46c820
commit d498b473c7
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/browser/static/js/node.ui.js
View File

@ -40,17 +40,19 @@ function($, _, pgAdmin, Backbone, Backform, Alertify, Node) {
// That means - we needs to fetch the options from that node. // That means - we needs to fetch the options from that node.
if (url) { if (url) {
var node = this.field.get('schema_node'), var node = this.field.get('schema_node'),
node_info = this.field.get('node_info'),
full_url = node.generate_url.apply( full_url = node.generate_url.apply(
node, [ node, [
null, url, this.field.get('node_data'), null, url, this.field.get('node_data'),
this.field.get('url_with_id') || false, this.field.get('node_info') this.field.get('url_with_id') || false, node_info
]), ]),
cache_level = this.field.get('cache_level'),
/* /*
* We needs to check, if we have already cached data for this url. * We needs to check, if we have already cached data for this url.
* If yes - use that, and do not bother about fetching it again, * If yes - use that, and do not bother about fetching it again,
* and use it. * and use it.
*/ */
data = node.cache(full_url); data = node.cache(url, node_info, cache_level);
if (_.isUndefined(data) || _.isNull(data)) { if (_.isUndefined(data) || _.isNull(data)) {
m.trigger('pgadmin-view:fetching', m, self.field); m.trigger('pgadmin-view:fetching', m, self.field);
$.ajax({ $.ajax({
@ -61,17 +63,17 @@ function($, _, pgAdmin, Backbone, Backform, Alertify, Node) {
* We will cache this data for short period of time for avoiding * We will cache this data for short period of time for avoiding
* same calls. * same calls.
*/ */
data = node.cache(full_url, res.data); data = node.cache(url, node_info, cache_level, res.data);
}, },
error: function() { error: function() {
m.trigger('pgadmin-view:fetch:error', m, self.field); m.trigger('pgadmin-view:fetch:error', m, self.field);
} }
}); });
m.trigger('pgadmin-view:fetched', m, self.field); m.trigger('pgadmin-view:fetched', m, self.field);
} else {
// To fetch only options from cache, we do not need time from 'at' attribute but only options
data = data.data;
} }
// To fetch only options from cache, we do not need time from 'at'
// attribute but only options.
data = data.data;
/* /*
* Transform the data * Transform the data

32
web/pgadmin/browser/templates/browser/js/node.js
View File

@ -1459,16 +1459,36 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
return res; return res;
}, },
cache: function(url, data) { cache: function(url, node_info, level, data) {
var cached = this.cached = this.cached || {}; var cached = this.cached = this.cached || {},
hash = url,
min_priority = (
node_info && node_info[level] && node_info[level].priority
) || 0;
if (_.isUndefined(data)) { if (node_info) {
return cached[url]; _.each(
_.sortBy(
_.values(
_.pick(
node_info,
function(v, k, o) {
console.log(arguments);
return (v.priority <= min_priority);
})),
function(o) { return o.priority; }),
function(o) {
hash = S('%s/%s').sprintf(hash, encodeURI(o._id)).value();
});
} }
cached[url] = {data: data, at: Date()}; if (_.isUndefined(data)) {
return cached[hash];
}
return data; var res = cached[hash] = {data: data, at: Date(), level: level};
return res;
} }
}); });