Release 2.84.0

switched gui tool from editor to builder

NEWS.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.84.0
+Released 2016-11-11
+
+New features:
+ - Analyses limit configuration allows to set other limits than timeout.
+
+
+## 2.83.1
+Released 2016-11-10
+
+Announcements:
+ - Upgrades camshaft to [0.48.1](https://github.com/CartoDB/camshaft/releases/tag/0.48.1).
+
+
 ## 2.83.0
 Released 2016-11-10
 

config/environments/development.js.example

@@ -220,8 +220,8 @@ var config = {
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
         limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
         }
     }
     ,millstone: {

config/environments/production.js.example

@@ -214,8 +214,8 @@ var config = {
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
         limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
         }
     }
     ,millstone: {

config/environments/staging.js.example

@@ -214,8 +214,8 @@ var config = {
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
         limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
         }
     }
     ,millstone: {

config/environments/test.js.example

@@ -215,8 +215,8 @@ var config = {
         // Define max execution time in ms for analyses or tags
         // If analysis or tag are not found in redis this values will be used as default.
         limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
         }
     }
     ,millstone: {

docs/static_maps_api.md

@@ -149,7 +149,7 @@ It is important to note that generated images are cached from the live data refe
 * While images can encompass an entirety of a map, the default limit for pixel range is 8192 x 8192.
 * Image resolution by default is set to 72 DPI
 * JPEG quality by default is 85%
-* Timeout limits for generating static maps are the same across the CARTO Editor and CARTO Engine. It is important to ensure timely processing of queries.
+* Timeout limits for generating static maps are the same across CARTO Builder and CARTO Engine. It is important to ensure timely processing of queries.
 
 ## Examples
 

lib/cartodb/backends/analysis.js

@@ -12,6 +12,7 @@ var REDIS_LIMITS = {
 function AnalysisBackend (metadataBackend, options) {
     this.metadataBackend = metadataBackend;
     this.options = options || {};
+    this.options.limits = this.options.limits || {};
     this.setBatchConfig(this.options.batch);
     this.setLoggerConfig(this.options.logger);
 }
@@ -59,24 +60,32 @@ AnalysisBackend.prototype.create = function(analysisConfiguration, analysisDefin
 
 AnalysisBackend.prototype.getAnalysesLimits = function(username, callback) {
     var self = this;
+
+    var analysesLimits = {
+        analyses: {
+            // buffer: {
+            //     timeout: 1000,
+            //     maxNumberOfRows: 1e6
+            // }
+        }
+    };
+
+    Object.keys(self.options.limits).forEach(function(analysisTypeOrTag) {
+        analysesLimits.analyses[analysisTypeOrTag] = _.extend({}, self.options.limits[analysisTypeOrTag]);
+    });
+
     var analysesLimitsKey = REDIS_LIMITS.PREFIX + username;
     this.metadataBackend.redisCmd(REDIS_LIMITS.DB, 'HGETALL', [analysesLimitsKey], function(err, analysesTimeouts) {
+        // analysesTimeouts wil be something like: { moran: 3000, intersection: 5000 }
         analysesTimeouts = analysesTimeouts || {};
 
-        _.defaults(analysesTimeouts, self.options.limits);
-
-        var analysesLimits = {
-            analyses: {
-                // buffer: {
-                //     timeout: 1000
-                // }
-            }
-        };
-
         Object.keys(analysesTimeouts).forEach(function(analysisType) {
-            analysesLimits.analyses[analysisType] = {
-                timeout: Number.isFinite(+analysesTimeouts[analysisType]) ? +analysesTimeouts[analysisType] : 0
-            };
+            analysesLimits.analyses[analysisType] = _.defaults(
+                {
+                    timeout: Number.isFinite(+analysesTimeouts[analysisType]) ? +analysesTimeouts[analysisType] : 0
+                },
+                analysesLimits.analyses[analysisType]
+            );
         });
 
         return callback(null, analysesLimits);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.83.0",
+  "version": "2.84.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -105,9 +105,9 @@
       }
     },
     "camshaft": {
-      "version": "0.48.0",
-      "from": "camshaft@0.48.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.48.0.tgz",
+      "version": "0.48.1",
+      "from": "camshaft@0.48.1",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.48.1.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.83.0",
+  "version": "2.84.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.48.0",
+    "camshaft": "0.48.1",
     "cartodb-psql": "~0.6.1",
     "cartodb-query-tables": "~0.1.0",
     "cartodb-redis": "0.13.1",

test/integration/analysis-backend-limits.js

@@ -44,7 +44,12 @@ describe('analysis-backend limits', function() {
     }
 
     it("should use limits from configuration", function(done) {
-        var analysisBackend = new AnalysisBackend(this.metadataBackend, { limits: { moran: 5000, kmeans: 5000 } });
+        var analysisBackend = new AnalysisBackend(this.metadataBackend, {
+            limits: {
+                moran: { timeout: 5000 },
+                kmeans: { timeout: 5000 }
+            }
+        });
         analysisBackend.getAnalysesLimits(user, function(err, result) {
             assert.ok(!err, err);
 
@@ -88,7 +93,11 @@ describe('analysis-backend limits', function() {
                 return done(err);
             }
 
-            var analysisBackend = new AnalysisBackend(self.metadataBackend, { limits: { moran: 1000 } });
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 }
+                }
+            });
             analysisBackend.getAnalysesLimits(user, function(err, result) {
                 assert.ok(!err, err);
 
@@ -109,7 +118,12 @@ describe('analysis-backend limits', function() {
                 return done(err);
             }
 
-            var analysisBackend = new AnalysisBackend(self.metadataBackend, { limits: { moran: 1000, kmeans: 1000 } });
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 },
+                    kmeans: { timeout: 1000 }
+                }
+            });
             analysisBackend.getAnalysesLimits(user, function(err, result) {
                 assert.ok(!err, err);
 
@@ -124,4 +138,30 @@ describe('analysis-backend limits', function() {
         });
     });
 
+    it("should allow to set other limits per analysis via configuration, and keep timeout from redis", function(done) {
+        var self = this;
+        var limits = ['aggregate-intersection', 5000];
+
+        withAnalysesLimits(limits, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    'aggregate-intersection': { timeout: 10000, maxNumberOfRows: 1e5 }
+                }
+            });
+            analysisBackend.getAnalysesLimits(user, function(err, result) {
+                assert.ok(!err, err);
+
+                assert.ok(result.analyses['aggregate-intersection']);
+                assert.equal(result.analyses['aggregate-intersection'].timeout, 5000);
+                assert.equal(result.analyses['aggregate-intersection'].maxNumberOfRows, 1e5);
+
+                done();
+            });
+        });
+    });
+
 });