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

Move sql helper functions to query-utils.js

Browse Source
This commit is contained in:
Raul Marin 2017-11-29 13:07:59 +01:00 committed by Raúl Marín
parent 90c9ad18e0
commit fcbf5ffcc5
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/cartodb/models/dataview/histograms/numeric-histogram.js
View File

@ -1,30 +1,13 @@
const BaseHistogram = require('./base-histogram'); const BaseHistogram = require('./base-histogram');
const debug = require('debug')('windshaft:dataview:numeric-histogram'); const debug = require('debug')('windshaft:dataview:numeric-histogram');
const utils = require('../../../utils/query-utils');
/** Cast the column column to epoch */
const columnCastTpl = ctx => `date_part('epoch', ${ctx.column})`;
/** If the column type is float, ignore any non numeric result (infinity / NaN) */
const handleFloatColum = ctx => `${!ctx.isFloatColumn ? `${ctx.column}` :
`nullif(nullif(nullif(${ctx.column}, 'infinity'::float), '-infinity'::float), 'NaN'::float)`
}`;
/** Count only infinity (positive and negative) appearances */
const countInfinites = ctx => `${!ctx.isFloatColumn ? `0` :
`sum(CASE WHEN (${ctx.column} = 'infinity'::float OR ${ctx.column} = '-infinity'::float) THEN 1 ELSE 0 END)`
}`;
/** Count only NaNs appearances*/
const countNaNs = ctx => `${!ctx.isFloatColumn ? `0` :
`sum(CASE WHEN (${ctx.column} = 'NaN'::float) THEN 1 ELSE 0 END)`
}`;
/** Query to get min and max values from the query */ /** Query to get min and max values from the query */
const irqQueryTpl = ctx => ` const irqQueryTpl = ctx => `
__cdb_filtered_source AS ( __cdb_filtered_source AS (
SELECT * SELECT *
FROM (${ctx.query}) __cdb_filtered_source_query FROM (${ctx.query}) __cdb_filtered_source_query
WHERE ${handleFloatColum(ctx)} IS NOT NULL WHERE ${utils.handleFloatColumn(ctx)} IS NOT NULL
), ),
__cdb_basics AS ( __cdb_basics AS (
SELECT SELECT
@ -85,7 +68,7 @@ module.exports = class NumericHistogram extends BaseHistogram {
_buildQuery (psql, override, callback) { _buildQuery (psql, override, callback) {
const histogramSql = this._buildQueryTpl({ const histogramSql = this._buildQueryTpl({
column: this._columnType === 'date' ? columnCastTpl({ column: this.column }) : this.column, column: this._columnType === 'date' ? utils.columnCastTpl({ column: this.column }) : this.column,
isFloatColumn: this._columnType === 'float', isFloatColumn: this._columnType === 'float',
query: this.query, query: this.query,
start: this._getBinStart(override), start: this._getBinStart(override),
@ -137,17 +120,18 @@ ${extra_queries}
SELECT SELECT
(${ctx.end} - ${ctx.start}) / ${ctx.bins}::float AS bin_width, (${ctx.end} - ${ctx.start}) / ${ctx.bins}::float AS bin_width,
${ctx.bins} as bins_number, ${ctx.bins} as bins_number,
sum(CASE WHEN (${ctx.column} IS NULL) THEN 1 ELSE 0 END) AS nulls_count, ${utils.countNULLs(ctx)} AS nulls_count,
${countInfinites(ctx)} AS infinities_count, ${utils.countInfinites(ctx)} AS infinities_count,
${countNaNs(ctx)} AS nans_count, ${utils.countNaNs(ctx)} AS nans_count,
min(${handleFloatColum(ctx)}) AS min, min(${utils.handleFloatColumn(ctx)}) AS min,
max(${handleFloatColum(ctx)}) AS max, max(${utils.handleFloatColumn(ctx)}) AS max,
avg(${handleFloatColum(ctx)}) AS avg, avg(${utils.handleFloatColumn(ctx)}) AS avg,
sum(CASE WHEN (${handleFloatColum(ctx)} is not NULL) THEN 1 ELSE 0 END) as freq, sum(CASE WHEN (${utils.handleFloatColumn(ctx)} is not NULL) THEN 1 ELSE 0 END) as freq,
CASE WHEN ${ctx.start} = ${ctx.end} CASE WHEN ${ctx.start} = ${ctx.end}
THEN 0 THEN 0
ELSE GREATEST(1, LEAST(${ctx.bins}, ELSE GREATEST(1, LEAST(
WIDTH_BUCKET(${handleFloatColum(ctx)}, ${ctx.start}, ${ctx.end}, ${ctx.bins}))) - 1 ${ctx.bins},
WIDTH_BUCKET(${utils.handleFloatColumn(ctx)}, ${ctx.start}, ${ctx.end}, ${ctx.bins}))) - 1
END AS bin END AS bin
FROM FROM
( (

31
lib/cartodb/utils/query-utils.js
View File

@ -24,3 +24,34 @@ module.exports.extractTableNames = function extractTableNames(query) {
module.exports.getQueryRowCount = function getQueryRowEstimation(query) { module.exports.getQueryRowCount = function getQueryRowEstimation(query) {
return 'select CDB_EstimateRowCount(\'' + query + '\') as rows'; return 'select CDB_EstimateRowCount(\'' + query + '\') as rows';
}; };
/** Cast the column to epoch */
module.exports.columnCastTpl = function columnCastTpl(ctx) {
return `date_part('epoch', ${ctx.column})`;
};
/** If the column type is float, ignore any non numeric result (infinity / NaN) */
module.exports.handleFloatColumn = function handleFloatColumn(ctx) {
return `${!ctx.isFloatColumn ? `${ctx.column}` :
`nullif(nullif(nullif(${ctx.column}, 'infinity'::float), '-infinity'::float), 'NaN'::float)`
}`;
};
/** Count NULL appearances */
module.exports.countNULLs= function countNULLs(ctx) {
return `sum(CASE WHEN (${ctx.column} IS NULL) THEN 1 ELSE 0 END)`;
};
/** Count only infinity (positive and negative) appearances */
module.exports.countInfinites = function countInfinites(ctx) {
return `${!ctx.isFloatColumn ? `0` :
`sum(CASE WHEN (${ctx.column} = 'infinity'::float OR ${ctx.column} = '-infinity'::float) THEN 1 ELSE 0 END)`
}`;
};
/** Count only NaNs appearances*/
module.exports.countNaNs = function countNaNs(ctx) {
return `${!ctx.isFloatColumn ? `0` :
`sum(CASE WHEN (${ctx.column} = 'NaN'::float) THEN 1 ELSE 0 END)`
}`;
};