Release 2.58.0

Fix release date
Bump version
2016-07-05 12:15:55 +02:00 · 2016-07-05 12:15:41 +02:00 · 2016-07-05 12:15:09 +02:00 · 2016-07-05 12:14:20 +02:00 · 2016-07-05 11:42:57 +02:00 · 2016-07-05 11:42:13 +02:00
8 changed files with 111 additions and 72 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,32 @@
 # Changelog

+## 2.58.0
+
+Released 2016-07-05
+
+Announcements:
+ - Upgrades camshaft to [0.29.2](https://github.com/CartoDB/camshaft/releases/tag/0.29.2).
+
+Bug fixes:
+ - Return full list of nodes in response metadata.
+
+
+## 2.57.0
+
+Released 2016-07-04
+
+Announcements:
+ - Upgrades camshaft to [0.28.1](https://github.com/CartoDB/camshaft/releases/tag/0.28.1).
+
+
+## 2.56.0
+
+Released 2016-07-04
+
+Announcements:
+ - Upgrades camshaft to [0.27.0](https://github.com/CartoDB/camshaft/releases/tag/0.27.0).
+
+
 ## 2.55.0

 Released 2016-07-04
--- a/lib/cartodb/backends/analysis-status.js
+++ b/lib/cartodb/backends/analysis-status.js
@@ -9,7 +9,10 @@ module.exports = AnalysisStatusBackend;
 AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {
    var nodeId = params.nodeId;

-    var statusQuery = 'SELECT node_id, status, updated_at FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\'';
+    var statusQuery = [
+        'SELECT node_id, status, updated_at, last_error_message as error_message',
+        'FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\''
+    ].join(' ');

    var pg = new PSQL(dbParamsFromReqParams(params));
    pg.query(statusQuery, function(err, result) {
@@ -21,10 +24,16 @@ AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {

        var rows = result.rows || [];

-        return callback(null, rows[0] || {
+        var statusResponse = rows[0] || {
            node_id: nodeId,
            status: 'unknown'
-        });
+        };
+
+        if (statusResponse.status !== 'failed') {
+            delete statusResponse.error_message;
+        }
+
+        return callback(null, statusResponse);
    }, true); // use read-only transaction
 };

--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -330,7 +330,7 @@ function getLastUpdatedTime(analysesResults, lastUpdateTime) {
        return lastUpdateTime;
    }
    return analysesResults.reduce(function(lastUpdateTime, analysis) {
-        return analysis.getSortedNodes().reduce(function(lastNodeUpdatedAtTime, node) {
+        return analysis.getNodes().reduce(function(lastNodeUpdatedAtTime, node) {
            var nodeUpdatedAtDate = node.getUpdatedAt();
            var nodeUpdatedTimeAt = (nodeUpdatedAtDate && nodeUpdatedAtDate.getTime()) || 0;
            return nodeUpdatedTimeAt > lastNodeUpdatedAtTime ? nodeUpdatedTimeAt : lastNodeUpdatedAtTime;
@@ -344,7 +344,7 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
    layergroup.metadata.analyses = [];

    analysesResults.forEach(function(analysis) {
-        var nodes = analysis.getSortedNodes();
+        var nodes = analysis.getNodes();
        layergroup.metadata.analyses.push({
            nodes: nodes.reduce(function(nodesIdMap, node) {
                if (node.params.id) {
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.55.0",
+  "version": "2.58.0",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -90,7 +90,7 @@
            },
            "mime-types": {
              "version": "2.1.11",
-              "from": "mime-types@>=2.1.2 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
@@ -105,9 +105,9 @@
      }
    },
    "camshaft": {
-      "version": "0.26.0",
-      "from": "camshaft@0.26.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.26.0.tgz",
+      "version": "0.29.2",
+      "from": "camshaft@0.29.2",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.29.2.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@@ -146,7 +146,7 @@
                    },
                    "inherits": {
                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
                    "isarray": {
@@ -1017,7 +1017,7 @@
          "dependencies": {
            "async": {
              "version": "1.5.2",
-              "from": "async@>=1.0.0 <2.0.0",
+              "from": "async@>=1.5.2 <2.0.0",
              "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
            }
          }
@@ -3026,6 +3026,11 @@
                      "from": "block-stream@*",
                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
                    },
+                    "boom": {
+                      "version": "2.10.1",
+                      "from": "boom@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                    },
                    "brace-expansion": {
                      "version": "1.1.4",
                      "from": "brace-expansion@>=1.0.0 <2.0.0",
@@ -3041,16 +3046,16 @@
                      "from": "chalk@>=1.1.1 <2.0.0",
                      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
                    },
-                    "boom": {
-                      "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                    },
                    "combined-stream": {
                      "version": "1.0.5",
                      "from": "combined-stream@>=1.0.5 <1.1.0",
                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
                    },
+                    "commander": {
+                      "version": "2.9.0",
+                      "from": "commander@>=2.9.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+                    },
                    "concat-map": {
                      "version": "0.0.1",
                      "from": "concat-map@0.0.1",
@@ -3066,11 +3071,6 @@
                      "from": "cryptiles@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
                    },
-                    "commander": {
-                      "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-                    },
                    "debug": {
                      "version": "2.2.0",
                      "from": "debug@>=2.2.0 <2.3.0",
@@ -3086,16 +3086,16 @@
                      "from": "delayed-stream@>=1.0.0 <1.1.0",
                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                    },
-                    "ecc-jsbn": {
-                      "version": "0.1.1",
-                      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                    },
                    "delegates": {
                      "version": "1.0.0",
                      "from": "delegates@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
                    },
+                    "ecc-jsbn": {
+                      "version": "0.1.1",
+                      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                    },
                    "escape-string-regexp": {
                      "version": "1.0.5",
                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
@@ -3136,16 +3136,16 @@
                      "from": "gauge@>=1.2.5 <1.3.0",
                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
                    },
-                    "generate-object-property": {
-                      "version": "1.2.0",
-                      "from": "generate-object-property@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                    },
                    "generate-function": {
                      "version": "2.0.0",
                      "from": "generate-function@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                    },
+                    "generate-object-property": {
+                      "version": "1.2.0",
+                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+                    },
                    "glob": {
                      "version": "7.0.3",
                      "from": "glob@>=7.0.0 <8.0.0",
@@ -3216,16 +3216,16 @@
                      "from": "is-property@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "from": "isarray@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                    },
                    "is-typedarray": {
                      "version": "1.0.0",
                      "from": "is-typedarray@>=1.0.0 <1.1.0",
                      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
                    },
+                    "isarray": {
+                      "version": "1.0.0",
+                      "from": "isarray@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+                    },
                    "isstream": {
                      "version": "0.1.2",
                      "from": "isstream@>=0.1.2 <0.2.0",
@@ -3236,16 +3236,16 @@
                      "from": "jodid25519@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
                    },
-                    "json-schema": {
-                      "version": "0.2.2",
-                      "from": "json-schema@0.2.2",
-                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                    },
                    "jsbn": {
                      "version": "0.1.0",
                      "from": "jsbn@>=0.1.0 <0.2.0",
                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                    },
+                    "json-schema": {
+                      "version": "0.2.2",
+                      "from": "json-schema@0.2.2",
+                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                    },
                    "json-stringify-safe": {
                      "version": "5.0.1",
                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
@@ -3478,18 +3478,6 @@
                        }
                      }
                    },
-                    "bl": {
-                      "version": "1.1.2",
-                      "from": "bl@>=1.1.2 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "2.0.6",
-                          "from": "readable-stream@>=2.0.5 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-                        }
-                      }
-                    },
                    "getpass": {
                      "version": "0.1.6",
                      "from": "getpass@>=0.1.1 <0.2.0",
@@ -3502,18 +3490,6 @@
                        }
                      }
                    },
-                    "sshpk": {
-                      "version": "1.8.3",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                        }
-                      }
-                    },
                    "rc": {
                      "version": "1.1.6",
                      "from": "rc@>=1.1.0 <1.2.0",
@@ -3526,6 +3502,18 @@
                        }
                      }
                    },
+                    "sshpk": {
+                      "version": "1.8.3",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                        }
+                      }
+                    },
                    "tar-pack": {
                      "version": "3.1.3",
                      "from": "tar-pack@>=3.1.0 <3.2.0",
@@ -3537,6 +3525,18 @@
                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
                        }
                      }
+                    },
+                    "bl": {
+                      "version": "1.1.2",
+                      "from": "bl@>=1.1.2 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.6",
+                          "from": "readable-stream@>=2.0.5 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+                        }
+                      }
                    }
                  }
                },
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.55.0",
+  "version": "2.58.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.26.0",
+    "camshaft": "0.29.2",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "~0.13.0",
--- a/test/acceptance/analysis/analysis-layers.js
+++ b/test/acceptance/analysis/analysis-layers.js
@@ -202,7 +202,7 @@ describe('analysis-layers', function() {
            assert.equal(analyses.length, 1, 'Invalid number of analyses in metadata');
            var nodes = analyses[0].nodes;
            var nodesIds = Object.keys(nodes);
-            assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745', 'HEAD']);
+            assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
            nodesIds.forEach(function(nodeId) {
                var node = nodes[nodeId];
                assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
--- a/test/acceptance/analysis/named-maps.js
+++ b/test/acceptance/analysis/named-maps.js
@@ -141,7 +141,7 @@ describe('named-maps analysis', function() {
                    assert.equal(analyses.length, 1, 'Invalid number of analyses in metadata');
                    var nodes = analyses[0].nodes;
                    var nodesIds = Object.keys(nodes);
-                    assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745', 'HEAD']);
+                    assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
                    nodesIds.forEach(function(nodeId) {
                        var node = nodes[nodeId];
                        assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
--- a/test/acceptance/analysis/regressions.js
+++ b/test/acceptance/analysis/regressions.js
@@ -100,10 +100,13 @@ describe('analysis-layers regressions', function() {
            assert.equal(analyses.length, 1);

            var expectedIds = ['customer_home_locations', 'b0', 'b1', 'a2', 'a3', 'a4'];
-            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length, Object.keys(analyses[0].nodes));
            expectedIds.forEach(function(expectedId) {
-                analyses[0].nodes.hasOwnProperty(expectedId);
+                assert.ok(
+                    analyses[0].nodes.hasOwnProperty(expectedId),
+                    'Missing "' + expectedId + '" from node list.'
+                );
            });
+            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length, Object.keys(analyses[0].nodes));

            testClient.drain(done);
        });
Author	SHA1	Message	Date
Raul Ochoa	ab0777b45f	Release 2.58.0	2016-07-05 12:15:55 +02:00
Raul Ochoa	962f94387b	Fix release date	2016-07-05 12:15:41 +02:00
Raul Ochoa	de5600b4fd	Bump version	2016-07-05 12:15:09 +02:00
Raul Ochoa	188a202f02	Merge pull request #538 from CartoDB/upgrade-camshaft Upgrades camshaft to 0.29.2	2016-07-05 12:14:20 +02:00
Raul Ochoa	19f39b87f5	Merge branch 'master' into upgrade-camshaft Conflicts: NEWS.md	2016-07-05 11:42:57 +02:00
Raul Ochoa	c759f314f9	Merge pull request #539 from CartoDB/nodes-metadata-fix Return full list of nodes in response metadata	2016-07-05 11:42:13 +02:00
Raul Ochoa	6c98f14c64	Return full list of nodes in response metadata	2016-07-05 11:26:52 +02:00
Raul Ochoa	f2348e1b24	Upgrades camshaft to 0.29.2	2016-07-05 11:25:24 +02:00
Raul Ochoa	4b5a10fe61	Upgrades camshaft to 0.29.1	2016-07-05 10:26:48 +02:00
Raul Ochoa	163fa58b5a	Merge pull request #537 from CartoDB/analysis-failed-status-error-message Include error message in node status endpoint	2016-07-05 10:22:43 +02:00
Raul Ochoa	b3bbb6af01	Include error message in node status endpoint	2016-07-04 18:40:11 +02:00
Raul Ochoa	28d711e1f4	Stubs next version	2016-07-04 17:54:39 +02:00
Raul Ochoa	410fdb8343	Release 2.57.0	2016-07-04 17:53:58 +02:00
Raul Ochoa	21c2f3bdd1	Merge pull request #536 from CartoDB/upgrade-camshaft Upgrade camshaft to 0.28.1	2016-07-04 17:53:20 +02:00
Raul Ochoa	baae080318	Merge remote-tracking branch 'origin/master' into upgrade-camshaft Conflicts: NEWS.md package.json	2016-07-04 17:04:54 +02:00
Raul Ochoa	81c0796056	Upgrades camshaft to 0.28.1	2016-07-04 17:03:56 +02:00
Daniel García Aubert	6ea5c5f414	Stubs next version	2016-07-04 16:29:30 +02:00
Daniel García Aubert	7e37705843	Release 2.56.0	2016-07-04 16:08:38 +02:00
Daniel García Aubert	425b5e6b4a	Upgrades camshaft version to 0.27.0	2016-07-04 15:56:04 +02:00
Raul Ochoa	8942c72fb2	Stubs next version	2016-07-04 10:28:44 +02:00