cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check CDB_QueryTable response before saving into cache

Browse Source 
Also add pid to /cachestatus (#83)
This commit is contained in:
Sandro Santilli 2013-02-13 16:43:04 +01:00
parent 5959e6465a
commit 7d2d585c54
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -2,6 +2,8 @@
----- -----
* Fix skipfields use with SHP output format (#81) * Fix skipfields use with SHP output format (#81)
* Fix Content-Disposition for error responses (#82) * Fix Content-Disposition for error responses (#82)
* Add pid to /cachestatus (#83)
* Check CDB_QueryTable response before saving into cache (#83)
1.3.4 (21/01/13) 1.3.4 (21/01/13)
----- -----

29
app/controllers/app.js
View File

@ -171,7 +171,7 @@ function handleQuery(req, res) {
// get all the tables from Cache or SQL // get all the tables from Cache or SQL
if (!_.isNull(tableCache[sql_md5]) && !_.isUndefined(tableCache[sql_md5])){ if (!_.isNull(tableCache[sql_md5]) && !_.isUndefined(tableCache[sql_md5])){
tableCache[sql_md5].hits++; tableCache[sql_md5].hits++;
return true; return false;
} else { } else {
pg.query("SELECT CDB_QueryTables($quotesql$" + sql + "$quotesql$)", this); pg.query("SELECT CDB_QueryTables($quotesql$" + sql + "$quotesql$)", this);
} }
@ -180,10 +180,20 @@ function handleQuery(req, res) {
if (err) throw err; if (err) throw err;
// store explain result in local Cache // store explain result in local Cache
if (_.isUndefined(tableCache[sql_md5])){ if ( result !== false ) {
tableCache[sql_md5] = result;
tableCache[sql_md5].may_write = queryMayWrite(sql); if ( result.rowCount === 1 ) {
tableCache[sql_md5].hits = 1; //initialise hit counter tableCache[sql_md5] = {
affected_tables: result.rows[0].cdb_querytables,
// check if query may possibly write
may_write: queryMayWrite(sql),
// initialise hit counter
hits: 1
};
} else {
console.log("[ERROR] Unexpected result from CDB_QueryTables: ");
console.dir(result);
}
} }
// TODO: refactor formats to external object // TODO: refactor formats to external object
@ -301,8 +311,7 @@ function handleCacheStatus(req, res){
var tableCacheValues = _.values(tableCache); var tableCacheValues = _.values(tableCache);
var totalExplainHits = _.reduce(tableCacheValues, function(memo, res) { return memo + res.hits}, 0); var totalExplainHits = _.reduce(tableCacheValues, function(memo, res) { return memo + res.hits}, 0);
var totalExplainKeys = tableCacheValues.length; var totalExplainKeys = tableCacheValues.length;
res.send({explain: {pid: process.pid, hits: totalExplainHits, keys : totalExplainKeys }});
res.send({explain: {hits: totalExplainHits, keys : totalExplainKeys }});
} }
// helper functions // helper functions
@ -813,11 +822,11 @@ function setCrossDomain(res){
res.header("Access-Control-Allow-Headers", "X-Requested-With, X-Prototype-Version, X-CSRF-Token"); res.header("Access-Control-Allow-Headers", "X-Requested-With, X-Prototype-Version, X-CSRF-Token");
} }
function generateCacheKey(database,tables,is_authenticated){ function generateCacheKey(database, query_info, is_authenticated){
if ( is_authenticated && tables.may_write ) { if ( is_authenticated && query_info.may_write ) {
return "NONE"; return "NONE";
} else { } else {
return database + ":" + tables.rows[0].cdb_querytables.split(/^\{(.*)\}$/)[1]; return database + ":" + query_info.affected_tables.split(/^\{(.*)\}$/)[1];
} }
} }