From 4e40a61795468b06cfaddc5a29b66616cc1ba402 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Wed, 2 Mar 2016 19:25:08 +0100 Subject: [PATCH 1/7] 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. --- lib/cartodb/utils/overviews_query_rewriter.js | 14 +-- test/unit/cartodb/overviews_query_rewriter.js | 118 +++++++----------- 2 files changed, 49 insertions(+), 83 deletions(-) diff --git a/lib/cartodb/utils/overviews_query_rewriter.js b/lib/cartodb/utils/overviews_query_rewriter.js index 0b6c592a..622c2018 100644 --- 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 ); }; diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js index 9adbe031..b58b55b0 100644 --- 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(); }); From e0d18e3c20cb20d16f305488cd63f2bed3450d66 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 3 Mar 2016 16:20:20 +0100 Subject: [PATCH 2/7] Back to pg 9.3 and postgresql-plpython-9.3 using sudo=true build --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8492e564..08f37c05 100644 --- 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 From b2539f52b8184157f1e6b2c769f2e6d541206bea Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 3 Mar 2016 19:01:40 +0100 Subject: [PATCH 3/7] Release 2.26.3 --- NEWS.md | 5 ++- npm-shrinkwrap.json | 103 +++++++++++++++++++++++++------------------- 2 files changed, 62 insertions(+), 46 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4afbaec7..b1acef78 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,10 @@ ## 2.26.3 -Released 2016-mm-dd +Released 2016-03-03 + +Improvements: + - Optimize overviews queries for efficient spatial filtering in PostgreSQL ## 2.26.2 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1cfa9c89..14d585bd 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -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" } } }, @@ -257,7 +257,7 @@ "dependencies": { "unpipe": { "version": "1.0.0", - "from": "unpipe@1.0.0", + "from": "unpipe@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } @@ -372,7 +372,7 @@ }, "type-is": { "version": "1.6.11", - "from": "type-is@>=1.6.10 <1.7.0", + "from": "type-is@>=1.6.6 <1.7.0", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.11.tgz", "dependencies": { "media-typer": { @@ -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", @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.0.0 <2.0.0", + "from": "async@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -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", @@ -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", From 6c3fde70e8e3781ce3ce993a5ea4dc98c8053ac3 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 3 Mar 2016 19:05:06 +0100 Subject: [PATCH 4/7] Stub next version --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index b1acef78..8fa300d8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.26.4 + +Released 2016-mm-dd + + ## 2.26.3 Released 2016-03-03 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 14d585bd..23e07d92 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.26.3", + "version": "2.26.4", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 2c8501d8..b35b6099 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.26.3", + "version": "2.26.4", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From f19c1a34eca0bb105334c1d3c62bc09e16d52dd2 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 3 Mar 2016 20:48:37 +0100 Subject: [PATCH 5/7] Implement CDB_QueryStatements as SQL language function Do not relies on cartodb-postgresql extension which relies on plpythonu language. That avoid installing it in travis-ci. --- test/support/prepare_db.sh | 2 -- test/support/sql/CDB_QueryStatements.sql | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh index b4b6a1a5..26e4c0b9 100755 --- a/test/support/prepare_db.sh +++ b/test/support/prepare_db.sh @@ -78,8 +78,6 @@ if test x"$PREPARE_PGSQL" = xyes; then sed "s/:TESTPASS/${TESTPASS}/" | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1 - psql -c "CREATE LANGUAGE plpythonu;" ${TEST_DB} - curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql cat sql/CDB_QueryStatements.sql sql/CDB_QueryTables.sql sql/CDB_Overviews.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1 diff --git a/test/support/sql/CDB_QueryStatements.sql b/test/support/sql/CDB_QueryStatements.sql index bb4d10cf..824f38ad 100644 --- a/test/support/sql/CDB_QueryStatements.sql +++ b/test/support/sql/CDB_QueryStatements.sql @@ -1,14 +1,16 @@ +-- DUMMY IMPLEMENTATION +-- Ref: https://github.com/CartoDB/cartodb-postgresql/blob/master/scripts-available/CDB_QueryStatements.sql + -- Return an array of statements found in the given query text -- -- Regexp curtesy of Hubert Lubaczewski (depesz) -- Implemented in plpython for performance reasons -- -CREATE OR REPLACE FUNCTION CDB_QueryStatements(query text) +CREATE OR REPLACE FUNCTION CDB_QueryStatements(query text) RETURNS SETOF TEXT AS $$ - import re - pat = re.compile( r'''((?:[^'"$;]+|"[^"]*"|'[^']*'|(\$[^$]*\$).*?\2)+)''', re.DOTALL ) - for match in pat.findall(query): - cleaned = match[0].strip() - if ( cleaned ): - yield cleaned -$$ language 'plpythonu' IMMUTABLE STRICT; + with matches as ( + select regexp_matches($1, $regexp$((?:[^'"$;]+|"[^"]*"|'[^']*'|(\$[^$]*\$).*?\2)+)$regexp$, 'g') as m + ) + select btrim(m[1]) from matches +$$ +LANGUAGE SQL IMMUTABLE STRICT; From 26e5b4f40460edd4f8154aff13b108de8259d081 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 3 Mar 2016 20:51:53 +0100 Subject: [PATCH 6/7] Do not install postgresql-plpython-9.3 in travis, so no more sudo:true --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08f37c05..3d9796bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,15 @@ -sudo: true +sudo: false addons: postgresql: "9.3" + apt: + packages: + - pkg-config + - libcairo2-dev + - libjpeg8-dev + - libgif-dev 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 From 3979cda8c2ec1d57f581797e69c626c28a6e0902 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 4 Mar 2016 00:11:06 +0100 Subject: [PATCH 7/7] Change comment about regex --- test/support/sql/CDB_QueryStatements.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/sql/CDB_QueryStatements.sql b/test/support/sql/CDB_QueryStatements.sql index 824f38ad..27627280 100644 --- a/test/support/sql/CDB_QueryStatements.sql +++ b/test/support/sql/CDB_QueryStatements.sql @@ -1,10 +1,10 @@ -- DUMMY IMPLEMENTATION -- Ref: https://github.com/CartoDB/cartodb-postgresql/blob/master/scripts-available/CDB_QueryStatements.sql +-- Originally implemented in plpython for performance reasons -- Return an array of statements found in the given query text -- -- Regexp curtesy of Hubert Lubaczewski (depesz) --- Implemented in plpython for performance reasons -- CREATE OR REPLACE FUNCTION CDB_QueryStatements(query text) RETURNS SETOF TEXT AS $$