Release 2.26.3

Merge pull request #390 from CartoDB/overviews-optimization
Optimize overviews queries
2016-03-03 19:01:40 +01:00 · 2016-03-03 18:59:24 +01:00 · 2016-03-03 17:39:28 +01:00 · 2016-03-03 17:20:22 +01:00 · 2016-03-03 16:20:20 +01:00 · 2016-03-02 19:25:08 +01:00
8 changed files with 136 additions and 146 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,11 @@
-sudo: false
+sudo: true

 addons:
-  postgresql: "9.4"
-  apt:
-    packages:
-    - postgresql-plpython-9.4
-    - pkg-config
-    - libcairo2-dev
-    - libjpeg8-dev
-    - libgif-dev
+  postgresql: "9.3"

 before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev
  - npm install -g npm@2
  - createdb template_postgis
  - psql -c "CREATE EXTENSION postgis" template_postgis
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,21 @@
 # Changelog

+## 2.26.3
+
+Released 2016-03-03
+
+Improvements:
+ - Optimize overviews queries for efficient spatial filtering in PostgreSQL
+
+
+## 2.26.2
+
+Released 2016-02-25
+
+Announcements:
+ - Upgrades windshaft to [1.13.2](https://github.com/CartoDB/Windshaft/releases/tag/1.13.2)
+
+
 ## 2.26.1

 Released 2016-02-24
--- a/lib/cartodb/api/overviews_metadata_api.js
+++ b/lib/cartodb/api/overviews_metadata_api.js
@@ -25,8 +25,7 @@ OverviewsMetadataApi.prototype.getOverviewsMetadata = function (username, sql, c
    var query = 'SELECT * FROM CDB_Overviews(CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$))';
    this.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) {
        if (err){
-            var msg = err.message ? err.message : err;
-            callback(new Error('could not get overviews metadata: ' + msg));
+            callback(err);
            return;
        }
        var metadata = {};
--- a/lib/cartodb/utils/overviews_query_rewriter.js
+++ b/lib/cartodb/utils/overviews_query_rewriter.js
@@ -74,14 +74,9 @@ function overviews_view_name(table) {
 }

 // replace a table name in a query by anoter name
-function replace_table_in_query(sql, old_table_name, new_table_name) {
+function replace_table_in_query(sql, old_table_name, replacement) {
    var old_table = TableNameParser.parse(old_table_name);
-    var new_table = TableNameParser.parse(new_table_name);
    var old_table_ident = TableNameParser.table_identifier(old_table);
-    var new_table_ident = TableNameParser.table_identifier(new_table);
-
-    // text that will be substituted by the table name pattern
-    var replacement = new_table_ident;

    // regular expression prefix (beginning) to match a table name
    function pattern_prefix(schema, identifier) {
@@ -127,12 +122,13 @@ function replace_table_in_query(sql, old_table_name, new_table_name) {
 function overviews_query(query, overviews, zoom_level_expression) {
    var replaced_query = query;
    var sql = "WITH\n  _vovw_scale AS ( SELECT " + zoom_level_expression + " AS _vovw_z )";
+    var replacement;
    for ( var table in overviews ) {
        if (overviews.hasOwnProperty(table)) {
            var table_overviews = overviews[table];
            var table_view = overviews_view_name(table);
-            replaced_query = replace_table_in_query(replaced_query, table, table_view);
-            sql += ",\n  " + table_view + " AS (\n" + overviews_view_for_table(table, table_overviews) + "\n  )";
+            replacement = "(\n" + overviews_view_for_table(table, table_overviews) + "\n  ) AS " + table_view;
+            replaced_query = replace_table_in_query(replaced_query, table, replacement);
        }
    }
    if ( replaced_query !== query ) {
@@ -173,7 +169,7 @@ OverviewsQueryRewriter.prototype.query = function(query, data) {

 OverviewsQueryRewriter.prototype.is_supported_query = function(sql) {
  return !!sql.match(
-    /^\s*SELECT\s+[\*\.a-z0-9_,\s]+?\s+FROM\s+((\"[^"]+\"|[a-z0-9_]+)\.)?(\"[^"]+\"|[a-z0-9_]+)\s*;?\s*$/i
+    /^\s*SELECT\s+[\*a-z0-9_,\s]+?\s+FROM\s+((\"[^"]+\"|[a-z0-9_]+)\.)?(\"[^"]+\"|[a-z0-9_]+)\s*;?\s*$/i
  );
 };

--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.26.1",
+  "version": "2.26.3",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -84,14 +84,14 @@
              "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
            },
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.9",
              "from": "mime-types@>=2.1.9 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.21.0",
+                  "from": "mime-db@>=1.21.0 <1.22.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
                }
              }
            }
@@ -192,14 +192,14 @@
          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
          "dependencies": {
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.9",
              "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.21.0",
+                  "from": "mime-db@>=1.21.0 <1.22.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
                }
              }
            },
@@ -381,14 +381,14 @@
              "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
            },
            "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.9",
              "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
              "dependencies": {
                "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.21.0",
+                  "from": "mime-db@>=1.21.0 <1.22.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
                }
              }
            }
@@ -520,9 +520,9 @@
      "resolved": "https://registry.npmjs.org/request/-/request-2.62.0.tgz",
      "dependencies": {
        "bl": {
-          "version": "1.0.3",
+          "version": "1.0.2",
          "from": "bl@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz",
          "dependencies": {
            "readable-stream": {
              "version": "2.0.5",
@@ -596,14 +596,14 @@
          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
        },
        "mime-types": {
-          "version": "2.1.10",
-          "from": "mime-types@>=2.1.9 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+          "version": "2.1.9",
+          "from": "mime-types@>=2.1.2 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
          "dependencies": {
            "mime-db": {
-              "version": "1.22.0",
-              "from": "mime-db@>=1.22.0 <1.23.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+              "version": "1.21.0",
+              "from": "mime-db@>=1.21.0 <1.22.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
            }
          }
        },
@@ -724,21 +724,14 @@
              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
              "dependencies": {
                "ansi-styles": {
-                  "version": "2.2.0",
+                  "version": "2.1.0",
                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz",
-                  "dependencies": {
-                    "color-convert": {
-                      "version": "1.0.0",
-                      "from": "color-convert@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"
-                    }
-                  }
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                },
                "escape-string-regexp": {
-                  "version": "1.0.5",
+                  "version": "1.0.4",
                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"
                },
                "has-ansi": {
                  "version": "2.0.0",
@@ -753,9 +746,9 @@
                  }
                },
                "strip-ansi": {
-                  "version": "3.0.1",
+                  "version": "3.0.0",
                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                  "dependencies": {
                    "ansi-regex": {
                      "version": "2.0.0",
@@ -784,9 +777,9 @@
              }
            },
            "is-my-json-valid": {
-              "version": "2.13.1",
+              "version": "2.12.4",
              "from": "is-my-json-valid@>=2.12.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz",
+              "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz",
              "dependencies": {
                "generate-function": {
                  "version": "2.0.0",
@@ -837,9 +830,9 @@
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
    },
    "windshaft": {
-      "version": "1.13.1",
-      "from": "windshaft@1.13.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.1.tgz",
+      "version": "1.13.2",
+      "from": "windshaft@1.13.2",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.2.tgz",
      "dependencies": {
        "abaculus": {
          "version": "1.1.0-cdb4",
@@ -3732,6 +3725,7 @@
        "turbo-cartocss": {
          "version": "0.4.0",
          "from": "turbo-cartocss@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/turbo-cartocss/-/turbo-cartocss-0.4.0.tgz",
          "dependencies": {
            "browser-request": {
              "version": "0.3.3",
@@ -3819,9 +3813,9 @@
              }
            },
            "postcss": {
-              "version": "5.0.16",
+              "version": "5.0.19",
              "from": "postcss@>=5.0.13 <6.0.0",
-              "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.16.tgz",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.19.tgz",
              "dependencies": {
                "supports-color": {
                  "version": "3.1.2",
@@ -3868,9 +3862,28 @@
                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                },
                "aws4": {
-                  "version": "1.2.1",
+                  "version": "1.3.2",
                  "from": "aws4@>=1.2.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz"
+                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "4.0.0",
+                      "from": "lru-cache@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz",
+                      "dependencies": {
+                        "pseudomap": {
+                          "version": "1.0.2",
+                          "from": "pseudomap@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
+                        },
+                        "yallist": {
+                          "version": "2.0.0",
+                          "from": "yallist@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
                },
                "bl": {
                  "version": "1.0.3",
@@ -4160,9 +4173,9 @@
                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                        },
                        "tweetnacl": {
-                          "version": "0.14.0",
+                          "version": "0.14.1",
                          "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.0.tgz"
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"
                        },
                        "jodid25519": {
                          "version": "1.0.2",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.26.1",
+    "version": "2.26.3",
    "description": "A map tile server for CartoDB",
    "keywords": [
      "cartodb"
@@ -26,7 +26,7 @@
        "node-statsd": "~0.0.7",
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "1.13.1",
+        "windshaft": "1.13.2",
        "step": "~0.0.6",
        "queue-async": "~1.0.7",
        "request": "~2.62.0",
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -70,7 +70,8 @@ describe('tests from old api translated to multilayer', function() {
            },
            function(res) {
                var parsed = JSON.parse(res.body);
-                assert.ok(parsed.errors[0].match(/<css input>:1:1: Unclosed block/));
+                assert.ok(parsed.errors[0].match(/^style0/));
+                assert.ok(parsed.errors[0].match(/missing closing/));
                done();
            }
        );
@@ -333,7 +334,7 @@ describe('tests from old api translated to multilayer', function() {

                var parsed = JSON.parse(res.body);
                assert.deepEqual(parsed, {
-                    errors: ["could not get overviews metadata: fake error message"]
+                    errors: ["fake error message"]
                });

                done();
--- a/test/unit/cartodb/overviews_query_rewriter.js
+++ b/test/unit/cartodb/overviews_query_rewriter.js
@@ -57,15 +57,15 @@ describe('Overviews query rewriter', function() {
        }
    };
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
+
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM table1_ov0, _vovw_scale WHERE _vovw_z = 0\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 0\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -83,13 +83,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -110,8 +109,8 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM  (\
            SELECT * FROM table1_ov0, _vovw_scale WHERE _vovw_z = 0\
            UNION ALL\
            SELECT * FROM table1_ov1, _vovw_scale WHERE _vovw_z = 1\
@@ -121,8 +120,7 @@ describe('Overviews query rewriter', function() {
            SELECT * FROM table1_ov3, _vovw_scale WHERE _vovw_z = 3\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 3\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -142,8 +140,8 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM table1_ov0, _vovw_scale WHERE _vovw_z = 0\
            UNION ALL\
            SELECT * FROM table1_ov1, _vovw_scale WHERE _vovw_z = 1\
@@ -151,8 +149,7 @@ describe('Overviews query rewriter', function() {
            SELECT * FROM table1_ov6, _vovw_scale WHERE _vovw_z > 1 AND _vovw_z <= 6\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 6\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -170,13 +167,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM public.table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM public.table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -194,13 +190,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM public.table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM public.table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";

    assertSameSql(overviews_sql, expected_sql);
@@ -219,13 +214,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          \"_vovw_table 1\" AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM public.\"table 1_ov2\", _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM public.\"table 1\", _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM \"_vovw_table 1\"\
+          ) AS \"_vovw_table 1\"\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -243,13 +237,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM \"user-1\".table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM \"user-1\".table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -269,13 +262,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          \"_vovw_table 1\" AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT * FROM (\
            SELECT * FROM \"user-1\".\"table 1_ov2\", _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM \"user-1\".\"table 1\", _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT * FROM \"_vovw_table 1\"\
+          ) AS \"_vovw_table 1\"\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -294,44 +286,19 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT column1, column2, column3 FROM (\
            SELECT * FROM table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT column1, column2, column3 FROM _vovw_table1\
-    ";
-    assertSameSql(overviews_sql, expected_sql);
-    done();
-  });
-
-  it('generates query using overviews for queries with selected columns and all columns', function(done){
-    var sql = "SELECT table1.*, column1, column2, column3 FROM table1";
-    var data = {
-        overviews: {
-            table1: {
-              2: { table: 'table1_ov2' }
-            }
-        }
-    };
-    var overviews_sql = overviewsQueryRewriter.query(sql, data);
-    var expected_sql = "\
-        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
-            SELECT * FROM table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
-            UNION ALL\
-            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT _vovw_table1.*, column1, column2, column3 FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
  });

  it('generates query using overviews for queries with a semicolon', function(done){
-    var sql = "SELECT table1.*, column1, column2, column3 FROM table1;";
+    var sql = "SELECT column1, column2, column3 FROM table1;";
    var data = {
        overviews: {
            table1: {
@@ -340,22 +307,22 @@ describe('Overviews query rewriter', function() {
        }
    };
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
+
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT column1, column2, column3 FROM (\
            SELECT * FROM table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT _vovw_table1.*, column1, column2, column3 FROM _vovw_table1;\
+          ) AS _vovw_table1;\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
  });

  it('generates query using overviews for queries with extra whitespace', function(done){
-    var sql = "  SELECT  table1.* , column1,column2,  column3 FROM  table1  ";
+    var sql = "  SELECT  column1,column2,  column3 FROM  table1  ";
    var data = {
        overviews: {
            table1: {
@@ -366,13 +333,12 @@ describe('Overviews query rewriter', function() {
    var overviews_sql = overviewsQueryRewriter.query(sql, data);
    var expected_sql = "\
        WITH\
-          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z ),\
-          _vovw_table1 AS (\
+          _vovw_scale AS ( SELECT ZoomLevel() AS _vovw_z )\
+          SELECT column1,column2, column3 FROM (\
            SELECT * FROM table1_ov2, _vovw_scale WHERE _vovw_z <= 2\
            UNION ALL\
            SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 2\
-          )\
-        SELECT _vovw_table1.* , column1,column2, column3 FROM _vovw_table1\
+          ) AS _vovw_table1\
    ";
    assertSameSql(overviews_sql, expected_sql);
    done();
@@ -422,6 +388,10 @@ describe('Overviews query rewriter', function() {
    overviews_sql = overviewsQueryRewriter.query(sql, data);
    assert.equal(overviews_sql, sql);

+    sql = "SELECT table1.*, column1, column2, column3 FROM table1";
+    overviews_sql = overviewsQueryRewriter.query(sql, data);
+    assert.equal(overviews_sql, sql);
+
    done();
  });
Author	SHA1	Message	Date
Javier Goizueta	b2539f52b8	Release 2.26.3	2016-03-03 19:01:40 +01:00
Javier Goizueta	47dfdf964e	Merge pull request #390 from CartoDB/overviews-optimization Optimize overviews queries	2016-03-03 18:59:24 +01:00
Raul Ochoa	66aea5e10f	Merge pull request #393 from CartoDB/travis-pg-93 Back to pg 9.3 and postgresql-plpython-9.3 using sudo=true build	2016-03-03 17:39:28 +01:00
Raul Ochoa	e0d18e3c20	Back to pg 9.3 and postgresql-plpython-9.3 using sudo=true build	2016-03-03 17:20:22 +01:00
Raul Ochoa	4b79d06ae3	Back to pg 9.3 and postgresql-plpython-9.3 using sudo=true build	2016-03-03 16:20:20 +01:00
Javier Goizueta	4e40a61795	Change form of overviews queries so they can be optimized The PostgreSQL planner wasn't applying the spatial filtering of tile bounds to the queries efficiently.	2016-03-02 19:25:08 +01:00
Javier Goizueta	2a789b5a5b	Merge pull request #386 from CartoDB/384-overviews-error-message Change error messages when getting overviews metadata fails	2016-02-26 19:10:09 +01:00
Raul Ochoa	1789993467	Stubs next version	2016-02-25 11:43:36 +01:00
Raul Ochoa	604b50ffb5	Release 2.26.2	2016-02-25 11:42:53 +01:00
Raul Ochoa	2818413c5a	Update windshaft to 1.13.2	2016-02-25 11:42:28 +01:00
Raul Ochoa	06164af17f	Stubs next version	2016-02-24 17:23:15 +01:00
Javier Goizueta	f0a1e7a0e0	Simplify error passing	2016-02-23 18:15:14 +01:00
Javier Goizueta	21f3c8a387	Change error messages when getting overviews metadata fails Remove the detail that the error occurred trying to get overviews metadata from the error message. This should be less confusing to the user.	2016-02-23 11:45:26 +01:00