Update NEWS.md with v5.3.1

Merge pull request #865 from CartoDB/perf-boost-agg-dataview
Improve the speed of the aggregation dataview
2018-02-13 09:05:06 +01:00 · 2018-02-13 09:04:00 +01:00 · 2018-02-12 19:35:34 +01:00 · 2018-02-12 19:33:35 +01:00 · 2018-02-12 19:24:53 +01:00 · 2018-02-12 12:19:36 +01:00
12 changed files with 158 additions and 123 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,23 @@
 # Changelog

+## 5.3.1
+Released 2018-02-13
+ - Improve the speed of the aggregation dataview #865
+
+## 5.3.0
+Released 2018-02-12
+ - Upgrades redis-mpool to 0.5.0
+ - Upgrades windshaft to 4.5.2
+ - Upgrades cartodb-redis to 0.15.0
+ - Adds metrics option to the Mapnik renderer
+ - Upgrades camshadft to 0.61.2
+
+## 5.2.1
+Released 2018-02-01
+
+Bug Fixes:
+- Allow use of aggregation with attributes #861
+
 ## 5.2.0
 Released 2018-02-01

--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -205,11 +205,12 @@ var config = {
              // much closer to the original geometry
              removeRepeatedPoints: false // this requires postgis >=2.2
          },
-
          // If enabled Mapnik will reuse the features retrieved from the database
          // instead of requesting them once per style inside a layer
-          'cache-features': true
+          'cache-features': true,

+          // Require metrics to the renderer
+          metrics: false
      },
      http: {
          timeout: 2000, // the timeout in ms for a http tile request
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -202,7 +202,10 @@ var config = {

          // If enabled Mapnik will reuse the features retrieved from the database
          // instead of requesting them once per style inside a layer
-          'cache-features': true
+          'cache-features': true,
+
+          // Require metrics to the renderer
+          metrics: false

      },
      http: {
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -202,7 +202,10 @@ var config = {

          // If enabled Mapnik will reuse the features retrieved from the database
          // instead of requesting them once per style inside a layer
-          'cache-features': true
+          'cache-features': true,
+
+          // Require metrics to the renderer
+          metrics: false

      },
      http: {
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -201,8 +201,10 @@ var config = {

          // If enabled Mapnik will reuse the features retrieved from the database
          // instead of requesting them once per style inside a layer
-          'cache-features': true
+          'cache-features': true,

+          // Require metrics to the renderer
+          metrics: false
      },
      http: {
          timeout: 2000, // the timeout in ms for a http tile request
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -131,7 +131,12 @@ const dimensionDefs = ctx => {
 // This is equivalent to `${256/ctx.res}*CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!))`
 // This is defined by the ctx.res parameter, which is the number of grid cells per tile linear dimension
 // (i.e. each tile is divided into ctx.res*ctx.res cells).
-const gridResolution = ctx => `(${256*0.00028/ctx.res}*!scale_denominator!)::double precision`;
+// We limit the the minimum resolution to avoid division by zero problems. The limit used is
+// the pixel size of zoom level 30 (i.e. 1/2*(30+8) of the full earth web-mercator extent), which is about 0.15 mm.
+const gridResolution = ctx => {
+    const minimumResolution = 2*Math.PI*6378137/Math.pow(2,38);
+    return `GREATEST(${256*0.00028/ctx.res}*!scale_denominator!, ${minimumResolution})::double precision`;
+};

 // Notes:
 // * We need to filter spatially using !bbox! to make the queries efficient because
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -2,19 +2,17 @@ const BaseDataview = require('./base');
 const debug = require('debug')('windshaft:dataview:aggregation');

 const filteredQueryTpl = ctx => `
-    filtered_source AS (
-        SELECT *
-        FROM (${ctx.query}) _cdb_filtered_source
-        ${ctx.aggregationColumn && ctx.isFloatColumn ? `
-        WHERE
-            ${ctx.aggregationColumn} != 'infinity'::float
-        AND
-            ${ctx.aggregationColumn} != '-infinity'::float
-        AND
-            ${ctx.aggregationColumn} != 'NaN'::float` :
-        ''
-        }
-    )
+    SELECT *
+    FROM (${ctx.query}) _cdb_filtered_source
+    ${ctx.aggregationColumn && ctx.isFloatColumn ? `
+    WHERE
+        ${ctx.aggregationColumn} != 'infinity'::float
+    AND
+        ${ctx.aggregationColumn} != '-infinity'::float
+    AND
+        ${ctx.aggregationColumn} != 'NaN'::float` :
+    ''
+    }
 `;

 const summaryQueryTpl = ctx => `
@@ -43,7 +41,7 @@ const rankedCategoriesQueryTpl = ctx => `
            ${ctx.column} AS category,
            ${ctx.aggregationFn} AS value,
            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` : ''}
        GROUP BY ${ctx.column}
        ORDER BY 2 DESC
@@ -134,7 +132,6 @@ const aggregationFnQueryTpl = ctx => `${ctx.aggregation}(${ctx.aggregationColumn

 const aggregationDataviewQueryTpl = ctx => `
    WITH
-    ${filteredQueryTpl(ctx)},
    ${summaryQueryTpl(ctx)},
    ${rankedCategoriesQueryTpl(ctx)},
    ${categoriesSummaryMinMaxQueryTpl(ctx)},
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -15,6 +15,7 @@ var rendererConfig = _.defaults(global.environment.renderer || {}, {
        bufferSize: 64,
        snapToGrid: false,
        clipByBox2d: false,
+        metrics: false,
        limits: {}
    },
    http: {}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "5.2.0",
+  "version": "5.3.1",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -25,10 +25,10 @@
  ],
  "dependencies": {
    "body-parser": "^1.18.2",
-    "camshaft": "0.60.0",
+    "camshaft": "0.61.2",
    "cartodb-psql": "0.10.2",
    "cartodb-query-tables": "0.3.0",
-    "cartodb-redis": "0.14.0",
+    "cartodb-redis": "0.15.0",
    "debug": "^3.1.0",
    "dot": "~1.0.2",
    "express": "~4.16.0",
@@ -40,14 +40,14 @@
    "node-statsd": "~0.0.7",
    "on-headers": "^1.0.1",
    "queue-async": "~1.0.7",
-    "redis-mpool": "0.4.1",
+    "redis-mpool": "0.5.0",
    "request": "^2.83.0",
    "semver": "~5.3.0",
    "step": "~0.0.6",
    "step-profiler": "~0.3.0",
    "turbo-carto": "0.20.2",
    "underscore": "~1.6.0",
-    "windshaft": "4.3.3",
+    "windshaft": "4.5.2",
    "yargs": "~5.0.0"
  },
  "devDependencies": {
@@ -56,7 +56,7 @@
    "mocha": "~3.4.1",
    "moment": "~2.18.1",
    "nock": "~2.11.0",
-    "redis": "~0.12.1",
+    "redis": "2.8.0",
    "strftime": "~0.8.2"
  },
  "scripts": {
--- a/test/acceptance/aggregation.js
+++ b/test/acceptance/aggregation.js
@@ -1438,6 +1438,43 @@ describe('aggregation', function () {
                    done();
                });
            });
+
+            it('aggregation should work with attributes', function (done) {
+                this.mapConfig = createVectorMapConfig([
+                    {
+                        type: 'cartodb',
+                        options: {
+                            sql: POINTS_SQL_1,
+                            cartocss: '#layer { marker-width: 7; }',
+                            cartocss_version: '2.3.0',
+                            aggregation: {
+                                threshold: 1
+                            },
+                            attributes: {
+                                id: 'cartodb_id',
+                                columns: [
+                                    'value'
+                                ]
+                            }
+                        }
+                    }
+                ]);
+                this.testClient = new TestClient(this.mapConfig);
+
+                this.testClient.getLayergroup((err, body) => {
+                    if (err) {
+                        return done(err);
+                    }
+
+                    assert.equal(typeof body.metadata, 'object');
+                    assert.ok(Array.isArray(body.metadata.layers));
+
+                    body.metadata.layers.forEach(layer => assert.ok(layer.meta.aggregation.mvt));
+                    body.metadata.layers.forEach(layer => assert.ok(layer.meta.aggregation.png));
+
+                    done();
+                });
+            });
        });
    });
 });
--- a/test/acceptance/ported/support/ported_server_options.js
+++ b/test/acceptance/ported/support/ported_server_options.js
@@ -27,6 +27,7 @@ module.exports = _.extend({}, serverOptions, {
            snapToGrid: false,
            clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
            scale_factors: [1, 2],
+            metrics: false,
            limits: {
                render: 0,
                cacheOnTimeout: true
--- a/yarn.lock
+++ b/yarn.lock
@@ -11,7 +11,7 @@
    node-pre-gyp "~0.6.30"
    protozero "1.5.1"

-"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb1":
+"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb1":
  version "2.5.1-cdb1"
  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/b0b5559f948e77b337bc9a9ae0bf6ec4249fba21"
  dependencies:
@@ -23,7 +23,7 @@
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2"

-"abaculus@github:cartodb/abaculus#2.0.3-cdb2":
+abaculus@cartodb/abaculus#2.0.3-cdb2:
  version "2.0.3-cdb2"
  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc"
  dependencies:
@@ -31,11 +31,7 @@
    d3-queue "^2.0.2"
    sphericalmercator "1.0.x"

-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-abbrev@1.0.x:
+abbrev@1, abbrev@1.0.x:
  version "1.0.9"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"

@@ -236,9 +232,9 @@ camelcase@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"

-camshaft@0.60.0:
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.60.0.tgz#0433b5a576e08cabbc9bae1e1b22305274b8b7b6"
+camshaft@0.61.2:
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.61.2.tgz#5c0d43ca769377c6cfb9808f1023d20ea3df55b3"
  dependencies:
    async "^1.5.2"
    bunyan "1.8.1"
@@ -247,7 +243,7 @@ camshaft@0.60.0:
    dot "^1.0.3"
    request "^2.69.0"

-"canvas@github:cartodb/node-canvas#1.6.2-cdb2":
+canvas@cartodb/node-canvas#1.6.2-cdb2:
  version "1.6.2-cdb2"
  resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
  dependencies:
@@ -265,15 +261,15 @@ carto@0.16.3:
    semver "^5.1.0"
    yargs "^4.2.0"

-"carto@github:cartodb/carto#0.15.1-cdb1":
+carto@CartoDB/carto#0.15.1-cdb1:
  version "0.15.1-cdb1"
-  resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
+  resolved "https://codeload.github.com/CartoDB/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
  dependencies:
    mapnik-reference "~6.0.2"
    optimist "~0.6.0"
    underscore "~1.6.0"

-"carto@github:cartodb/carto#0.15.1-cdb3":
+carto@cartodb/carto#0.15.1-cdb3:
  version "0.15.1-cdb3"
  resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
  dependencies:
@@ -299,12 +295,12 @@ cartodb-query-tables@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/cartodb-query-tables/-/cartodb-query-tables-0.3.0.tgz#56e18d869666eb2e8e2cb57d0baf3acc923f8756"

-cartodb-redis@0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-0.14.0.tgz#6f82fdb3e5b7c8005dbaccd6172c1706c4378df2"
+cartodb-redis@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-0.15.0.tgz#509ab9f62b8cae0838bcb8db1cb9d6355704ace3"
  dependencies:
    dot "~1.0.2"
-    redis-mpool "~0.4.1"
+    redis-mpool "^0.5.0"
    underscore "~1.6.0"

 caseless@~0.12.0:
@@ -549,14 +545,14 @@ domutils@1.5:
    dom-serializer "0"
    domelementtype "1"

-dot@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
-
-dot@~1.0.2:
+dot@^1.0.3, dot@~1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/dot/-/dot-1.0.3.tgz#f8750bfb6b03c7664eb0e6cb1eb4c66419af9427"

+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 dtrace-provider@~0.6:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.6.0.tgz#0b078d5517937d873101452d9146737557b75e51"
@@ -677,14 +673,10 @@ extend@~3.0.0, extend@~3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"

-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"

-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
 fast-deep-equal@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
@@ -791,7 +783,7 @@ gdal@~0.9.2:
    nan "~2.6.2"
    node-pre-gyp "~0.6.36"

-generic-pool@2.4.3:
+generic-pool@2.4.3, generic-pool@~2.4.0, generic-pool@~2.4.1:
  version "2.4.3"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"

@@ -803,10 +795,6 @@ generic-pool@~2.2.0, generic-pool@~2.2.1:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be"

-generic-pool@~2.4.0, generic-pool@~2.4.1:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7"
-
 get-caller-file@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -1257,8 +1245,8 @@ lodash@3.7.x:
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"

 lodash@^4.5.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

 log4js@cartodb/log4js-node#cdb:
  version "0.6.25"
@@ -1347,9 +1335,9 @@ mime@~1.2.11:
  version "1.2.11"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"

-mime@~1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+mime@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"

 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
  version "3.0.4"
@@ -1357,7 +1345,7 @@ mime@~1.3.4:
  dependencies:
    brace-expansion "^1.1.7"

-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"

@@ -1365,10 +1353,6 @@ minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 minimist@~0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
@@ -1395,11 +1379,7 @@ mocha@~3.4.1:
    mkdirp "0.5.1"
    supports-color "3.1.2"

-moment@^2.10.6:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
-
-moment@~2.18.1:
+moment@^2.10.6, moment@~2.18.1:
  version "2.18.1"
  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

@@ -1513,14 +1493,10 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

-object-assign@4.1.0:
+object-assign@4.1.0, object-assign@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
 object-keys@~0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
@@ -1649,7 +1625,7 @@ pg-types@1.*:
    postgres-date "~1.0.0"
    postgres-interval "^1.1.0"

-"pg@github:cartodb/node-postgres#6.1.6-cdb1":
+pg@cartodb/node-postgres#6.1.6-cdb1:
  version "6.1.6"
  resolved "https://codeload.github.com/cartodb/node-postgres/tar.gz/3eef52dd1e655f658a4ee8ac5697688b3ecfed44"
  dependencies:
@@ -1817,7 +1793,7 @@ read-pkg@^1.0.0:
    normalize-package-data "^2.3.2"
    path-type "^1.0.0"

-readable-stream@1.1:
+readable-stream@1.1, readable-stream@~1.1.9:
  version "1.1.13"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
  dependencies:
@@ -1847,27 +1823,30 @@ readable-stream@~1.0.2:
    isarray "0.0.1"
    string_decoder "~0.10.x"

-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+redis-commands@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"

-redis-mpool@0.4.1, redis-mpool@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.4.1.tgz#d917c0a4ed57a1291a9c6eb35434e6c0b7046f80"
+redis-mpool@0.5.0, redis-mpool@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.5.0.tgz#9a22dcffb4ad796ec88ce3038b991deae9d1fda7"
  dependencies:
    generic-pool "~2.1.1"
    hiredis "~0.5.0"
-    redis "~0.12.1"
+    redis "^2.8.0"
    underscore "~1.6.0"

-redis@~0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-0.12.1.tgz#64df76ad0fc8acebaebd2a0645e8a48fac49185e"
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@2.8.0, redis@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"

 repeat-string@^1.5.2:
  version "1.6.1"
@@ -1965,9 +1944,9 @@ safe-json-stringify@~1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911"

-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

 semver@4.3.2:
  version "4.3.2"
@@ -1981,10 +1960,6 @@ semver@~5.0.3:
  version "5.0.3"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"

-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 send@0.16.1:
  version "0.16.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -2082,14 +2057,10 @@ speedometer@~0.1.2:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d"

-sphericalmercator@1.0.4:
+sphericalmercator@1.0.4, sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.4.tgz#baad4e34187f06e87f2e92fc1280199fa1b01d4e"

-sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.5.tgz#ddc5a049e360e000d0fad9fc22c4071882584980"
-
 split@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
@@ -2127,11 +2098,7 @@ sshpk@^1.7.0:
    jsbn "~0.1.0"
    tweetnacl "~0.14.0"

-"statuses@>= 1.3.1 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-statuses@~1.3.1:
+"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"

@@ -2239,13 +2206,13 @@ through@2:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

-"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb4":
-  version "0.6.18-cdb4"
-  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/510cfb6f033f7551f973886751643202d4cb5f4a"
+tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb5:
+  version "0.6.18-cdb5"
+  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35"
  dependencies:
    "@carto/mapnik" "~3.6.2-carto.0"
    generic-pool "~2.4.0"
-    mime "~1.3.4"
+    mime "~1.6.0"
    sphericalmercator "~1.0.4"
    step "~0.0.5"

@@ -2400,9 +2367,9 @@ window-size@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"

-windshaft@4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.3.3.tgz#a48fdd6ca05257c103f34c80195722ef52dc0813"
+windshaft@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.2.tgz#d371af414fc4fbf98bd0f1aaabed91aa43224567"
  dependencies:
    "@carto/mapnik" "3.6.2-carto.2"
    "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1
@@ -2414,13 +2381,13 @@ windshaft@4.3.3:
    dot "~1.0.2"
    grainstore "1.8.2"
    queue-async "~1.0.7"
-    redis-mpool "0.4.1"
+    redis-mpool "^0.5.0"
    request "^2.83.0"
    semver "~5.0.3"
    sphericalmercator "1.0.4"
    step "~0.0.6"
    tilelive "5.12.2"
-    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb4
+    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb5
    torque.js "~2.11.0"
    underscore "~1.6.0"
Author	SHA1	Message	Date
Rafa de la Torre	97972ac73f	Update NEWS.md with v5.3.1	2018-02-13 09:05:06 +01:00
Rafa de la Torre	c3b38b2f60	Merge pull request #865 from CartoDB/perf-boost-agg-dataview Improve the speed of the aggregation dataview	2018-02-13 09:04:00 +01:00
Rafa de la Torre	b4e06ec1ac	Update NEWS.md and stub version	2018-02-12 19:35:34 +01:00
Rafa de la Torre	d0a8bd428f	Merge remote-tracking branch 'origin/master' into perf-boost-agg-dataview	2018-02-12 19:33:35 +01:00
Rafa de la Torre	251fe96509	Cosmetic fix, as suggested in PR	2018-02-12 19:24:53 +01:00
Raul Marin	3539b658fb	Update Windshaft to 4.5.2	2018-02-12 12:19:36 +01:00
Javier Goizueta	abf33a1c68	Release 5.3.0	2018-02-12 12:03:02 +01:00
Javier Goizueta	fc6790ea1e	Merge pull request #866 from CartoDB/update-camshaft-to-0.61.2 Update camshaft to 0.61.2	2018-02-12 11:56:31 +01:00
Raul Marin	ac6f0e1c67	Update Windshaft to 4.5.1	2018-02-12 11:35:46 +01:00
Javier Goizueta	ee7917676b	Update camshaft to 0.61.2 This is to fixe a bug in the line-sequential analyses (length was incorrect)	2018-02-08 17:00:13 +01:00
Rafa de la Torre	065f56e161	Improve the speed of the aggregation dataview Improve the performance of the aggregation dataview. Instead of using a CTE (WITH) for filtered_source, which is only used in one place to calculate ranks, inject it as a subquery. This way the planner has a chance to ignore uneeded columns as well as to parallelize the exectution of the window function (WindowAgg in the query plan). That is the part that takes most of the time of the query. The improvement is about 20-40% in speed on PG10 with 4 cores.	2018-02-07 18:10:13 +01:00
Raúl Marín	b32a0a6547	Merge pull request #864 from Algunenano/master_metrics Add metrics option to Mapnik renderer (off by default)	2018-02-06 16:48:22 +01:00
Raul Marin	d634be0c30	Update NEWs and Windshaft to 4.5.0	2018-02-06 16:10:44 +01:00
Raul Marin	f9fe3ace37	Add mapnik metrics option	2018-02-06 16:07:22 +01:00
Simon Martín	6cd8131888	updating NEWS	2018-02-06 11:30:34 +01:00
Simon Martín	0ea76f7d15	Merge pull request #849 from CartoDB/redis4 Redis4 support	2018-02-06 11:24:02 +01:00
Simon Martín	51e5b5c255	upgrading cartodb-redis, redis-mpool and windshaft versions	2018-02-05 18:09:14 +01:00
Simon Martín	cedcc094e6	Merge branch 'master' into redis4	2018-02-05 12:42:59 +01:00
Javier Goizueta	bbe8d4e820	Stub next version	2018-02-01 16:39:43 +01:00
Javier Goizueta	5aa98c4ab2	Release 5.2.1	2018-02-01 16:37:05 +01:00
Javier Goizueta	d6a9103779	Merge pull request #861 from CartoDB/860-aggregation-min-res Limit the minimum size of the the aggregation grid	2018-02-01 16:32:35 +01:00
Javier Goizueta	2e7784ddf2	Add comment to clafify aggregation resolution limit	2018-02-01 10:26:52 +01:00
Raul Marin	086be461b2	Stub next version	2018-02-01 09:33:18 +01:00
Javier Goizueta	80604b739a	Add test for aggregation with attributes This reveals #860	2018-01-31 18:56:24 +01:00
Javier Goizueta	d88fbbaa87	Use camelCase	2018-01-31 18:55:28 +01:00
Javier Goizueta	7db0744f67	Simplify expression	2018-01-31 17:54:40 +01:00
Javier Goizueta	d1fcd797a3	Limit the minimum size of the the aggregation grid Fixes #860	2018-01-31 17:46:13 +01:00
Simon Martín	2c703e5c16	updating node-redis-mpool dev version	2018-01-19 14:40:27 +01:00
Simon Martín	e68ba95fed	adding cartodb-redis with redis4 support	2018-01-18 15:16:40 +01:00
Simon Martín	83d00a8aca	Merge branch 'master' into redis4	2018-01-17 10:29:32 +01:00
Simon Martín	479e8970a1	Merge branch 'master' into redis4	2018-01-16 15:10:08 +01:00
Simon Martín	cf5e797f90	supporting redis4	2018-01-16 11:59:23 +01:00