cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for arbitrary aggregation SQL expressions.

Browse Source 
Only the supported aggregate functions can be used now, currently count, sum, avg, min & max.
This commit is contained in:
Javier Goizueta 2017-12-12 16:17:42 +01:00
parent eb2825eea8
commit 4405d61845
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/cartodb/models/aggregation/aggregation-templates.js
View File

@ -9,7 +9,25 @@ module.exports = (options) => {
return templateFn; return templateFn;
}; };
const aggregate_columns = ctx => { const SUPPORTED_AGGREGATE_FUNCTIONS = {
'count': {
sql: (column_name, params) => `count(${params.aggregated_column || '*'})`
},
'avg': {
sql: (column_name, params) => `avg(${params.aggregated_column || column_name})`
},
'sum': {
sql: (column_name, params) => `sum(${params.aggregated_column || column_name})`
},
'min': {
sql: (column_name, params) => `min(${params.aggregated_column || column_name})`
},
'max': {
sql: (column_name, params) => `max(${params.aggregated_column || column_name})`
}
};
const aggregateColumns = ctx => {
let columns = ctx.columns || {}; let columns = ctx.columns || {};
if (Object.keys(columns).length === 0) { if (Object.keys(columns).length === 0) {
// default aggregation // default aggregation
@ -20,21 +38,22 @@ const aggregate_columns = ctx => {
}; };
} }
return Object.keys(columns).map(column_name => { return Object.keys(columns).map(column_name => {
let aggregate_expression = columns[column_name].aggregate_expression;
if (!aggregate_expression) {
const aggregate_function = columns[column_name].aggregate_function || 'count'; const aggregate_function = columns[column_name].aggregate_function || 'count';
const aggregated_column = columns[column_name].aggregated_column || '*'; const aggregate_definition = SUPPORTED_AGGREGATE_FUNCTIONS[aggregate_function];
aggregate_expression = `${aggregate_function}(${aggregated_column})`; if (!aggregate_definition) {
throw new Error("Invalid Aggregate function: '" + aggregate_function + "'");
} }
const aggregate_expression = aggregate_definition.sql(column_name, columns[column_name]);
return `${aggregate_expression} AS ${column_name}`; return `${aggregate_expression} AS ${column_name}`;
}).join(', '); }).join(', ');
}; };
// Notes: // Notes:
// * ${ctx.res*0.00028/256}*!scale_denominator! is equivalent to // * ${ctx.res*0.00028/256}*!scale_denominator! is equivalent to
// * ${ctx.res/256}*CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!)) // ${ctx.res/256}*CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!))
// * We need to filter spatially using !bbox! to make the queries efficient because the filter added by Mapnik // * We need to filter spatially using !bbox! to make the queries efficient because
// * (wrapping the query) is only applied after the aggregation. // the filter added by Mapnik (wrapping the query)
// is only applied after the aggregation.
// * This queries are used for rendering and the_geom is omitted in the results for better performance // * This queries are used for rendering and the_geom is omitted in the results for better performance
const aggregationQueryTemplates = { const aggregationQueryTemplates = {
@ -52,7 +71,7 @@ const aggregationQueryTemplates = {
AVG(ST_Y(_cdb_query.the_geom_webmercator)) AVG(ST_Y(_cdb_query.the_geom_webmercator))
), 3857 ), 3857
) AS the_geom_webmercator, ) AS the_geom_webmercator,
${aggregate_columns(ctx)} ${aggregateColumns(ctx)}
FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params
WHERE _cdb_query.the_geom_webmercator && _cdb_params.bbox WHERE _cdb_query.the_geom_webmercator && _cdb_params.bbox
GROUP BY GROUP BY
@ -77,7 +96,7 @@ const aggregationQueryTemplates = {
) AS the_geom_webmercator, ) AS the_geom_webmercator,
Floor(ST_X(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gx, Floor(ST_X(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gx,
Floor(ST_Y(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gy, Floor(ST_Y(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gy,
${aggregate_columns(ctx)} ${aggregateColumns(ctx)}
FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params
WHERE the_geom_webmercator && _cdb_params.bbox WHERE the_geom_webmercator && _cdb_params.bbox
GROUP BY _cdb_gx, _cdb_gy GROUP BY _cdb_gx, _cdb_gy
@ -97,7 +116,7 @@ const aggregationQueryTemplates = {
), _cdb_clusters AS ( ), _cdb_clusters AS (
SELECT SELECT
MIN(cartodb_id) AS cartodb_id, MIN(cartodb_id) AS cartodb_id,
${aggregate_columns(ctx)} ${aggregateColumns(ctx)}
FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params
WHERE _cdb_query.the_geom_webmercator && _cdb_params.bbox WHERE _cdb_query.the_geom_webmercator && _cdb_params.bbox
GROUP BY GROUP BY