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

Merge branch 'master' into project-auth-api

Browse Source
This commit is contained in:
Daniel García Aubert 2018-02-28 14:43:12 +01:00
commit 5c2248d419
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS.md
View File

@ -1,5 +1,13 @@
# Changelog # Changelog
## 5.3.2
Released yyyy-mm-dd
- Upgrades Windshaft to 4.5.3
## 5.3.1
Released 2018-02-13
- Improve the speed of the aggregation dataview #865
## 5.3.0 ## 5.3.0
Released 2018-02-12 Released 2018-02-12
- Upgrades redis-mpool to 0.5.0 - Upgrades redis-mpool to 0.5.0

27
lib/cartodb/models/dataview/aggregation.js
View File

@ -2,19 +2,17 @@ const BaseDataview = require('./base');
const debug = require('debug')('windshaft:dataview:aggregation'); const debug = require('debug')('windshaft:dataview:aggregation');
const filteredQueryTpl = ctx => ` const filteredQueryTpl = ctx => `
filtered_source AS ( SELECT *
SELECT * FROM (${ctx.query}) _cdb_filtered_source
FROM (${ctx.query}) _cdb_filtered_source ${ctx.aggregationColumn && ctx.isFloatColumn ? `
${ctx.aggregationColumn && ctx.isFloatColumn ? ` WHERE
WHERE ${ctx.aggregationColumn} != 'infinity'::float
${ctx.aggregationColumn} != 'infinity'::float AND
AND ${ctx.aggregationColumn} != '-infinity'::float
${ctx.aggregationColumn} != '-infinity'::float AND
AND ${ctx.aggregationColumn} != 'NaN'::float` :
${ctx.aggregationColumn} != 'NaN'::float` : ''
'' }
}
)
`; `;
const summaryQueryTpl = ctx => ` const summaryQueryTpl = ctx => `
@ -43,7 +41,7 @@ const rankedCategoriesQueryTpl = ctx => `
${ctx.column} AS category, ${ctx.column} AS category,
${ctx.aggregationFn} AS value, ${ctx.aggregationFn} AS value,
row_number() OVER (ORDER BY ${ctx.aggregationFn} desc) as rank row_number() OVER (ORDER BY ${ctx.aggregationFn} desc) as rank
FROM filtered_source FROM (${filteredQueryTpl(ctx)}) filtered_source
${ctx.aggregationColumn !== null ? `WHERE ${ctx.aggregationColumn} IS NOT NULL` : ''} ${ctx.aggregationColumn !== null ? `WHERE ${ctx.aggregationColumn} IS NOT NULL` : ''}
GROUP BY ${ctx.column} GROUP BY ${ctx.column}
ORDER BY 2 DESC ORDER BY 2 DESC
@ -134,7 +132,6 @@ const aggregationFnQueryTpl = ctx => `${ctx.aggregation}(${ctx.aggregationColumn
const aggregationDataviewQueryTpl = ctx => ` const aggregationDataviewQueryTpl = ctx => `
WITH WITH
${filteredQueryTpl(ctx)},
${summaryQueryTpl(ctx)}, ${summaryQueryTpl(ctx)},
${rankedCategoriesQueryTpl(ctx)}, ${rankedCategoriesQueryTpl(ctx)},
${categoriesSummaryMinMaxQueryTpl(ctx)}, ${categoriesSummaryMinMaxQueryTpl(ctx)},

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "5.3.0", "version": "5.3.2",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"
@ -48,7 +48,7 @@
"step-profiler": "~0.3.0", "step-profiler": "~0.3.0",
"turbo-carto": "0.20.2", "turbo-carto": "0.20.2",
"underscore": "~1.6.0", "underscore": "~1.6.0",
"windshaft": "4.5.2", "windshaft": "4.5.3",
"yargs": "~5.0.0" "yargs": "~5.0.0"
}, },
"devDependencies": { "devDependencies": {

6
yarn.lock
View File

@ -2373,9 +2373,9 @@ window-size@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
windshaft@4.5.2: windshaft@4.5.3:
version "4.5.2" version "4.5.3"
resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.2.tgz#d371af414fc4fbf98bd0f1aaabed91aa43224567" resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.3.tgz#45e792af06b224f78f44b6eb3b0ecb9d90dcc943"
dependencies: dependencies:
"@carto/mapnik" "3.6.2-carto.2" "@carto/mapnik" "3.6.2-carto.2"
"@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1 "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1