Merge pull request #740 from CartoDB/2.86.1-fix-pg-vulnerability

2.86.1 fix pg vulnerability
trying another travis configuration for postgres9.5
2017-09-01 17:12:02 +02:00 · 2017-09-01 13:11:28 +02:00 · 2017-09-01 13:06:19 +02:00 · 2016-12-02 15:19:29 +01:00 · 2016-12-02 15:07:59 +01:00 · 2016-12-02 14:00:21 +01:00
47 changed files with 3889 additions and 1821 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules*
 config.status*
 config/environments/*.js
 .idea
+.vscode
 tools/munin/windshaft.conf
 logs/
 pids/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,20 @@
+dist: trusty # only environment that supports Postgres 9.5 at this time
+sudo: required
 addons:
+  postgresql: "9.5"
  apt:
    packages:
+      - postgresql-9.5-postgis-2.3
+      - postgresql-contrib-9.5
+      - postgresql-plpython-9.5
+      - postgis
      - pkg-config
      - libcairo2-dev
      - libjpeg8-dev
      - libgif-dev
+      - libpango1.0-dev

 before_install:
-  - npm install -g npm@2
-  - lsb_release -a
-  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
-  - sudo apt-get -qq purge postgis* postgresql*
-  - sudo rm -Rf /var/lib/postgresql /etc/postgresql
-  - sudo apt-add-repository --yes ppa:cartodb/postgresql-9.5
-  - sudo apt-add-repository --yes ppa:cartodb/gis
-  - sudo apt-get update
-  - sudo apt-get install -q postgresql-9.5-postgis-2.2
-  - sudo apt-get install -q postgresql-plpython-9.5
-  - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.5/main/pg_hba.conf
-  - sudo service postgresql restart
  - createdb template_postgis
  - createuser publicuser
  - psql -c "CREATE EXTENSION postgis" template_postgis
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 1. Test (make clean all check), fix if broken before proceeding
-2. Ensure proper version in package.json 
+2. Ensure proper version in package.json
 3. Ensure NEWS section exists for the new version, review it, add release date
 4. Recreate npm-shrinkwrap.json with: `npm install --no-shrinkwrap && npm shrinkwrap`
 5. Commit package.json, npm-shrinwrap.json, NEWS
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,320 @@
 # Changelog

+## 2.86.2
+Released 2017-09-01
+
+Bug fixes:
+ - Adding a new cartodb-psql fixing a pg vulnerability
+
+
+## 2.86.1
+Released 2016-12-02
+
+Bug fixes:
+ - Maps with analyses and `sql_wrap` were broken #599.
+
+
+## 2.86.0
+Released 2016-12-02
+
+Announcements:
+ - Upgrades windshaft to [2.6.3](https://github.com/CartoDB/Windshaft/releases/tag/2.6.3).
+
+
+## 2.85.1
+Released 2016-11-30
+
+Announcements:
+ - Upgrades camshaft to [0.48.4](https://github.com/CartoDB/camshaft/releases/tag/0.48.4).
+
+
+## 2.85.0
+Released 2016-11-24
+
+New features:
+ - Allow to set resource URL templates with substitution tokens #594.
+
+
+## 2.84.2
+Released 2016-11-23
+
+Announcements:
+ - Upgrades camshaft to [0.48.3](https://github.com/CartoDB/camshaft/releases/tag/0.48.3).
+
+
+## 2.84.1
+Released 2016-11-23
+
+Announcements:
+ - Upgrades camshaft to [0.48.2](https://github.com/CartoDB/camshaft/releases/tag/0.48.2).
+
+
+## 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
+
+Announcements:
+ - Upgrades camshaft to [0.48.0](https://github.com/CartoDB/camshaft/releases/tag/0.48.0).
+
+
+## 2.82.0
+Released 2016-11-08
+
+Announcements:
+ - Upgrades camshaft to [0.47.0](https://github.com/CartoDB/camshaft/releases/tag/0.47.0).
+
+
+## 2.81.1
+Released 2016-11-05
+
+Announcements:
+ - Upgrades windshaft to [2.6.2](https://github.com/CartoDB/windshaft/releases/tag/2.6.2).
+ - Upgrades camshaft to [0.46.3](https://github.com/CartoDB/camshaft/releases/tag/0.46.3).
+
+
+## 2.81.0
+Released 2016-11-02
+
+Enhancements:
+ - Returns errors with context when query layer does not retrieve geometry column
+
+Announcements:
+ - Upgrades windshaft to [2.6.1](https://github.com/CartoDB/windshaft/releases/tag/2.6.1).
+ - Upgrades camshaft to [0.46.2](https://github.com/CartoDB/camshaft/releases/tag/0.46.2).
+
+
+## 2.80.2
+Released 2016-10-26
+
+Bug fixes:
+ - Fix order in categories query to get ramps
+
+
+## 2.80.1
+Released 2016-10-25
+
+Announcements:
+ - Upgrades camshaft to [0.46.1](https://github.com/CartoDB/camshaft/releases/tag/0.46.1).
+
+
+## 2.80.0
+Released 2016-10-20
+
+Announcements:
+ - Upgrades camshaft to [0.46.0](https://github.com/CartoDB/camshaft/releases/tag/0.46.0).
+
+New features:
+ - Default analyses limits can be defined in configuration.
+
+
+## 2.79.0
+Released 2016-10-11
+
+New features:
+ - Retrieve analysis limits and pass them into camshaft.
+
+Announcements:
+ - Upgrades turbo-carto to [0.18.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.18.0).
+ - Upgrades camshaft to [0.45.0](https://github.com/CartoDB/camshaft/releases/tag/0.45.0).
+
+
+## 2.78.1
+Released 2016-09-30
+
+Announcements:
+ - Upgrades camshaft to [0.44.2](https://github.com/CartoDB/camshaft/releases/tag/0.44.2).
+
+
+## 2.78.0
+Released 2016-09-29
+
+New features:
+ - Add metadata about processed turbo-carto rules.
+
+Announcements:
+ - Upgrades turbo-carto to [0.17.1](https://github.com/CartoDB/turbo-carto/releases/tag/0.17.1).
+
+
+## 2.77.1
+
+Released 2016-09-28
+
+Announcements:
+ - Upgrades camshaft to [0.44.1](https://github.com/CartoDB/camshaft/releases/tag/0.44.1).
+
+
+## 2.77.0
+
+Released 2016-09-26
+
+Announcements:
+ - Upgrades camshaft to [0.44.0](https://github.com/CartoDB/camshaft/releases/tag/0.44.0).
+ - Adds a new configuration for camshaft: logger stream.
+
+
+## 2.76.0
+
+Released 2016-09-15
+
+New features:
+ - Allow to use `--config /path/to/config.js` to specify configuration file.
+   - Environment will be loaded from config file if `environment` key is present, otherwise it keeps current behaviour.
+
+Bug fixes:
+ - Allow to use absolute paths for log files #570.
+
+
+## 2.75.0
+
+Released 2016-09-14
+
+Announcements:
+ - Upgrades camshaft to [0.43.0](https://github.com/CartoDB/camshaft/releases/tag/0.43.0).
+
+
+## 2.74.1
+
+Released 2016-09-07
+
+Announcements:
+ - Upgrades camshaft to [0.42.1](https://github.com/CartoDB/camshaft/releases/tag/0.42.1).
+
+
+## 2.74.0
+
+Released 2016-09-06
+
+Enhancements:
+ - Layers in previews can be shown or hidden using `preview_layers` property in template map
+
+
+## 2.73.1
+
+Released 2016-09-06
+
+Bug fixes:
+ - Fixes missing column in fixture table `cdb_analysis_catalog`.
+
+
+## 2.73.0
+
+Released 2016-09-06
+
+Announcements:
+ - Upgrades camshaft to [0.42.0](https://github.com/CartoDB/camshaft/releases/tag/0.42.0).
+
+
+## 2.72.0
+
+Released 2016-08-23
+
+Announcements:
+ - Upgrades camshaft to [0.41.0](https://github.com/CartoDB/camshaft/releases/tag/0.41.0).
+
+
+## 2.71.0
+
+Released 2016-08-17
+
+Announcements:
+ - Upgrades windshaft to [2.5.0](https://github.com/CartoDB/windshaft/releases/tag/2.5.0).
+
+
+## 2.70.0
+
+Released 2016-08-16
+
+Announcements:
+ - Upgrades camshaft to [0.40.0](https://github.com/CartoDB/camshaft/releases/tag/0.40.0).
+
+
+## 2.69.1
+
+Released 2016-08-12
+
+Announcements:
+ - Upgrades windshaft to [2.4.2](https://github.com/CartoDB/windshaft/releases/tag/2.4.2).
+
+
+## 2.69.0
+
+Released 2016-08-11
+
+Announcements:
+ - Upgrades camshaft to [0.39.0](https://github.com/CartoDB/camshaft/releases/tag/0.39.0).
+
+
+## 2.68.0
+
+Released 2016-07-21
+
+Announcements:
+ - Upgrades turbo-carto to [0.16.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.16.0).
+
+
+## 2.67.1
+
+Released 2016-07-21
+
+Announcements:
+ - Upgrades camshaft to [0.38.1](https://github.com/CartoDB/camshaft/releases/tag/0.38.1).
+
+
+## 2.67.0
+
+Released 2016-07-21
+
+Announcements:
+ - Upgrades camshaft to [0.38.0](https://github.com/CartoDB/camshaft/releases/tag/0.38.0).
+
+
+## 2.66.2
+
+Released 2016-07-20
+
+Announcements:
+ - Upgrades turbo-carto to [0.15.1](https://github.com/CartoDB/turbo-carto/releases/tag/0.15.1).
+
+
+## 2.66.1
+
+Released 2016-07-20
+
+Announcements:
+ - Upgrades turbo-carto to [0.15.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.15.0).
+
+
+## 2.66.0
+
+Released 2016-07-18
+
+Announcements:
+ - Available new endpoint to check user analyses.
+ - Upgrades camshaft to [0.37.1](https://github.com/CartoDB/camshaft/releases/tag/0.37.1).
+
+
+## 2.65.0
+
+Released 2016-07-15
+
+Announcements:
+ - Upgrades cartodb-redis to 0.13.1.
+ - Upgrades camshaft to [0.37.0](https://github.com/CartoDB/camshaft/releases/tag/0.37.0).
+
+
 ## 2.64.0

 Released 2016-07-12
--- a/app.js
+++ b/app.js
@@ -5,20 +5,35 @@ var fs = require('fs');

 var _ = require('underscore');

-var ENVIRONMENT;
-if ( process.argv[2] ) {
-    ENVIRONMENT = process.argv[2];
-} else if ( process.env.NODE_ENV ) {
-    ENVIRONMENT = process.env.NODE_ENV;
-} else {
-    ENVIRONMENT = 'development';
-}
-
 // jshint undef:false
 var log = console.log.bind(console);
 var logError = console.error.bind(console);
 // jshint undef:true

+var argv = require('yargs')
+    .usage('Usage: $0 <environment> [options]')
+    .help('h')
+    .example(
+    '$0 production -c /etc/sql-api/config.js',
+    'start server in production environment with /etc/sql-api/config.js as config file'
+)
+    .alias('h', 'help')
+    .alias('c', 'config')
+    .nargs('c', 1)
+    .describe('c', 'Load configuration from path')
+    .argv;
+
+var environmentArg = argv._[0] || process.env.NODE_ENV || 'development';
+var configurationFile = path.resolve(argv.config || './config/environments/' + environmentArg + '.js');
+if (!fs.existsSync(configurationFile)) {
+    logError('Configuration file "%s" does not exist', configurationFile);
+    process.exit(1);
+}
+
+global.environment = require(configurationFile);
+var ENVIRONMENT = argv._[0] || process.env.NODE_ENV || global.environment.environment;
+process.env.NODE_ENV = ENVIRONMENT;
+
 var availableEnvironments = {
    production: true,
    staging: true,
@@ -33,16 +48,6 @@ if (!availableEnvironments[ENVIRONMENT]){
 }

 process.env.NODE_ENV = ENVIRONMENT;
-
-// set environment specific variables
-global.environment = require('./config/environments/' + ENVIRONMENT);
-
-global.log4js = require('log4js');
-var log4js_config = {
-  appenders: [],
-  replaceConsole: true
-};
-
 if (global.environment.uv_threadpool_size) {
    process.env.UV_THREADPOOL_SIZE = global.environment.uv_threadpool_size;
 }
@@ -58,25 +63,31 @@ var agentOptions = _.defaults(global.environment.httpAgent || {}, {
 http.globalAgent = new http.Agent(agentOptions);
 https.globalAgent = new https.Agent(agentOptions);

+
+global.log4js = require('log4js');
+var log4jsConfig = {
+    appenders: [],
+    replaceConsole: true
+};
+
 if ( global.environment.log_filename ) {
-  var logdir = path.dirname(global.environment.log_filename);
-  // See cwd inlog4js.configure call below
-  logdir = path.resolve(__dirname, logdir);
-  if ( ! fs.existsSync(logdir) ) {
-    logError("Log filename directory does not exist: " + logdir);
-    process.exit(1);
-  }
-  log("Logs will be written to " + global.environment.log_filename);
-  log4js_config.appenders.push(
-    { type: "file", filename: global.environment.log_filename }
-  );
+    var logFilename = path.resolve(global.environment.log_filename);
+    var logDirectory = path.dirname(logFilename);
+    if (!fs.existsSync(logDirectory)) {
+        logError("Log filename directory does not exist: " + logDirectory);
+        process.exit(1);
+    }
+    log("Logs will be written to " + logFilename);
+    log4jsConfig.appenders.push(
+        { type: "file", absolute: true, filename: logFilename }
+    );
 } else {
-  log4js_config.appenders.push(
-    { type: "console", layout: { type:'basic' } }
-  );
+    log4jsConfig.appenders.push(
+        { type: "console", layout: { type:'basic' } }
+    );
 }

-global.log4js.configure(log4js_config, { cwd: __dirname });
+global.log4js.configure(log4jsConfig);
 global.logger = global.log4js.getLogger();

 global.environment.api_hostname = require('os').hostname().split('.')[0];
@@ -99,6 +110,7 @@ var listener = server.listen(serverOptions.bind.port, serverOptions.bind.host, b
 var version = require("./package").version;

 listener.on('listening', function() {
+    log('Using configuration file "%s"', configurationFile);
    log(
        "Windshaft tileserver %s started on %s:%s PID=%d (%s)",
        version, serverOptions.bind.host, serverOptions.bind.port, process.pid, ENVIRONMENT
@@ -114,7 +126,7 @@ setInterval(function() {

 process.on('SIGHUP', function() {
    global.log4js.clearAndShutdownAppenders(function() {
-        global.log4js.configure(log4js_config);
+        global.log4js.configure(log4jsConfig);
        global.logger = global.log4js.getLogger();
        log('Log files reloaded');
    });
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -23,6 +23,21 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        https: 'http://localhost.lan:{{=it.port}}/user/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -62,6 +77,7 @@ var config = {
        extent: "-180,-90,180,90",
        srid: 4326,
        */
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
@@ -95,6 +111,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -209,6 +229,18 @@ var config = {
            endpoint: 'http://127.0.0.1:8080/api/v2/sql/job',
            // the template to use for adding the host header in the batch api requests
            hostHeaderTemplate: '{{=it.username}}.localhost.lan'
+        },
+        logger: {
+            // If filename is given logs comming from analysis client  will be written
+            // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
+            // Log file will be re-opened on receiving the HUP signal
+            filename: '/tmp/analysis.log'
+        },
+        // 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: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -23,6 +23,21 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.cdn_url}}/{{=it.user}}/api/v1/map',
+        https: 'https://{{=it.cdn_url}}/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -56,6 +71,7 @@ var config = {
        host: '127.0.0.1',
        port: 6432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        /*
         * Set persist_connection to false if you want
@@ -89,6 +105,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -203,6 +223,18 @@ var config = {
            endpoint: 'http://127.0.0.1:8080/api/v2/sql/job',
            // the template to use for adding the host header in the batch api requests
            hostHeaderTemplate: '{{=it.username}}.localhost.lan'
+        },
+        logger: {
+            // If filename is given logs comming from analysis client  will be written
+            // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
+            // Log file will be re-opened on receiving the HUP signal
+            filename: 'logs/analysis.log'
+        },
+        // 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: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -23,6 +23,21 @@ var config = {
    // "/tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        https: 'https://{{=it.cdn_url}}/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -56,6 +71,7 @@ var config = {
        host: '127.0.0.1',
        port: 6432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
@@ -89,6 +105,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -203,6 +223,18 @@ var config = {
            endpoint: 'http://127.0.0.1:8080/api/v2/sql/job',
            // the template to use for adding the host header in the batch api requests
            hostHeaderTemplate: '{{=it.username}}.localhost.lan'
+        },
+        logger: {
+            // If filename is given logs comming from analysis client  will be written
+            // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
+            // Log file will be re-opened on receiving the HUP signal
+            filename: 'logs/analysis.log'
+        },
+        // 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: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -23,6 +23,20 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -56,6 +70,7 @@ var config = {
        host: '127.0.0.1',
        port: 5432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
@@ -89,6 +104,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -204,6 +223,18 @@ var config = {
            endpoint: 'http://127.0.0.1:8080/api/v2/sql/job',
            // the template to use for adding the host header in the batch api requests
            hostHeaderTemplate: '{{=it.username}}.localhost.lan'
+        },
+        logger: {
+            // If filename is given logs comming from analysis client  will be written
+            // there, in append mode. Otherwise 'log_filename' is used. Otherwise stdout is used (default).
+            // Log file will be re-opened on receiving the HUP signal
+            filename: 'node-windshaft.log'
+        },
+        // 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: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/docs/anonymous_maps.md
+++ b/docs/anonymous_maps.md
@@ -141,9 +141,6 @@ https://{username}.carto.com/api/v1/map/{layergroupid}/0,3,4/{z}/{x}/{y}.png
 Some notes about filtering:

  - Invalid index values or out of bounds indexes will end in `Invalid layer filtering` errors.
-  - Once a Mapnik layer is selected, all Mapnik layers will get blended. As this may change in the future **it is
-  recommended** to always select all Mapnik layers if you want to select at least one so you will get a consistent
-  behavior in the future.
  - Ordering is not considered. So right now filtering layers 0,3,4 is the very same thing as filtering 3,4,0. As this
  may change in the future **it is recommended** to always select the layers in ascending order so you will get a
  consistent behavior in the future.
--- a/docs/named_maps.md
+++ b/docs/named_maps.md
@@ -1,10 +1,10 @@
 # Named Maps

-Named Maps are essentially the same as Anonymous Maps except the MapConfig is stored on the server, and the map is given a unique name. You can create Named Maps from private data, and users without an API Key can view your Named Map (while keeping your data private). 
+Named Maps are essentially the same as Anonymous Maps except the MapConfig is stored on the server, and the map is given a unique name. You can create Named Maps from private data, and users without an API Key can view your Named Map (while keeping your data private).

-The Named Map workflow consists of uploading a MapConfig file to CARTO servers, to select data from your CARTO user database by using SQL, and specifying the CartoCSS for your map. 
+The Named Map workflow consists of uploading a MapConfig file to CARTO servers, to select data from your CARTO user database by using SQL, and specifying the CartoCSS for your map.

-The response back from the API provides the template_id of your Named Map as the `name` (the identifier of your Named Map), which is the name that you specified in the MapConfig. You can  which you can then use to create your Named Map details, or [fetch XYZ tiles](#fetching-xyz-tiles-for-named-maps) directly for Named Maps. 
+The response back from the API provides the template_id of your Named Map as the `name` (the identifier of your Named Map), which is the name that you specified in the MapConfig. You can  which you can then use to create your Named Map details, or [fetch XYZ tiles](#fetching-xyz-tiles-for-named-maps) directly for Named Maps.

 **Tip:** You can also use a Named Map that you created (which is defined by its `name`), to create a map using CARTO.js. This is achieved by adding the [`namedmap` type](http://docs.carto.com/carto-engine/carto-js/layer-source-object/#named-maps-layer-source-object-type-namedmap) layer source object to draw the Named Map.

@@ -84,6 +84,10 @@ The `name` argument defines how to name this "template_name".json. Note that the
      "south": -45,
      "east": 45,
      "north": 45
+    },
+    "preview_layers": {
+      "0": true,
+      "layer1": false
    }
  }
 }
@@ -95,22 +99,22 @@ Params | Description
 --- | ---
 name | There can only be _one_ template with the same name for any user. Valid names start with a letter or a number, and only contain letters, numbers, dashes (-), or underscores (_). _This is specific to the name of your Named Map that is specified in the `name` property of the template file_.

-auth | 
+auth |
 --- | ---
 &#124;_ method | `"token"` or `"open"` (`"open"` is the default if no method is specified. Use `"token"` to password-protect your map)
 &#124;_ valid_tokens | when `"method"` is set to `"token"`, the values listed here allow you to instantiate the Named Map. See this [example](http://docs.carto.com/faqs/manipulating-your-data/#how-to-create-a-password-protected-named-map) for how to create a password-protected map.
 placeholders | Placeholders are variables that can be placed in your template.json file's SQL or CartoCSS.
 layergroup | the layergroup configurations, as specified in the template. See [MapConfig File Format](http://docs.carto.com/carto-engine/maps-api/mapconfig/) for more information.
-view (optional) | extra keys to specify the view area for the map. It can be used to have a static preview of a Named Map without having to instantiate it. It is possible to specify it with `center` + `zoom` or with a bounding box `bbox`. Center+zoom takes precedence over bounding box.
+view (optional) | extra keys to specify the view area for the map. It can be used to have a static preview of a Named Map without having to instantiate it. It is possible to specify it with `center` + `zoom` or with a bounding box `bbox`. Center+zoom takes precedence over bounding box. Also it is possible to choose which layers are visible or not with `preview_layers` indicating its visibility by layer index or id (visible by default).
 --- | ---
 &#124;_ zoom | The zoom level to use

-&#124;_ center | 
+&#124;_ center |
 --- | ---
 &#124;_ &#124;_ lng | The longitude to use for the center
 &#124;_ &#124;_ lat | The latitude to use for the center

-&#124;_ bounds | 
+&#124;_ bounds |
 --- | ---
 &#124;_ &#124;_ west | LowerCorner longitude for the bounding box, in decimal degrees (aka most western)
 &#124;_ &#124;_ south | LowerCorner latitude for the bounding box, in decimal degrees (aka most southern)
@@ -160,7 +164,7 @@ curl -X POST \

 #### Response

-The response back from the API provides the name of your MapConfig as a template, enabling you to edit the Named Map details by inserting your variables into the template where placeholders are defined, and create custom queries using SQL. 
+The response back from the API provides the name of your MapConfig as a template, enabling you to edit the Named Map details by inserting your variables into the template where placeholders are defined, and create custom queries using SQL.

 ```javascript
 {
@@ -516,7 +520,7 @@ If you are creating a Torque layer in a Named Map without using the Torque.js li
    })
    .addTo(map)
    .done(function(layer) {
-  
+
    });
 }
 ```
@@ -535,7 +539,7 @@ Optionally, authenticated users can fetch projected tiles (XYZ tiles or Mapnik R

 ### Fetch XYZ Tiles Directly with a URL

-Authenticated users, with an auth token, can use XYZ-based URLs to fetch tiles directly, and instantiate the Named Map as part of the request to your application. You do not have to do any other steps to initialize your map. 
+Authenticated users, with an auth token, can use XYZ-based URLs to fetch tiles directly, and instantiate the Named Map as part of the request to your application. You do not have to do any other steps to initialize your map.

 To call a template_id in a URL:

--- a/docs/static_maps_api.md
+++ b/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

--- a/lib/cartodb/backends/analysis.js
+++ b/lib/cartodb/backends/analysis.js
@@ -1,19 +1,93 @@
-var camshaft = require('camshaft');
+'use strict';

-function AnalysisBackend(options) {
-    var batchConfig = options.batch || {};
+var _ = require('underscore');
+var camshaft = require('camshaft');
+var fs = require('fs');
+
+var REDIS_LIMITS = {
+    DB: 5,
+    PREFIX: 'limits:analyses:' // + username
+};
+
+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);
+}
+
+module.exports = AnalysisBackend;
+
+AnalysisBackend.prototype.setBatchConfig = function (options) {
+    var batchConfig = options || {};
    batchConfig.endpoint = batchConfig.endpoint || 'http://127.0.0.1:8080/api/v1/sql/job';
    batchConfig.inlineExecution = batchConfig.inlineExecution || false;
    batchConfig.hostHeaderTemplate = batchConfig.hostHeaderTemplate || '{{=it.username}}.localhost.lan';
    this.batchConfig = batchConfig;
-}
+};

-module.exports = AnalysisBackend;
+AnalysisBackend.prototype.setLoggerConfig = function (options) {
+    this.loggerConfig = options || {};
+
+    if (this.loggerConfig.filename) {
+        this.stream = fs.createWriteStream(this.loggerConfig.filename, { flags: 'a', encoding: 'utf8' });
+
+        process.on('SIGHUP', function () {
+            if (this.stream) {
+                this.stream.destroy();
+            }
+
+            this.stream = fs.createWriteStream(this.loggerConfig.filename, { flags: 'a', encoding: 'utf8' });
+        }.bind(this));
+    }
+};

 AnalysisBackend.prototype.create = function(analysisConfiguration, analysisDefinition, callback) {
    analysisConfiguration.batch.endpoint = this.batchConfig.endpoint;
    analysisConfiguration.batch.inlineExecution = this.batchConfig.inlineExecution;
    analysisConfiguration.batch.hostHeaderTemplate = this.batchConfig.hostHeaderTemplate;

-    camshaft.create(analysisConfiguration, analysisDefinition, callback);
+    analysisConfiguration.logger = {
+        stream: this.stream ? this.stream : process.stdout
+    };
+
+    this.getAnalysesLimits(analysisConfiguration.user, function(err, limits) {
+        analysisConfiguration.limits = limits || {};
+        camshaft.create(analysisConfiguration, analysisDefinition, callback);
+    });
+};
+
+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 || {};
+
+        Object.keys(analysesTimeouts).forEach(function(analysisType) {
+            analysesLimits.analyses[analysisType] = _.defaults(
+                {
+                    timeout: Number.isFinite(+analysesTimeouts[analysisType]) ? +analysesTimeouts[analysisType] : 0
+                },
+                analysesLimits.analyses[analysisType]
+            );
+        });
+
+        return callback(null, analysesLimits);
+    });
 };
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -55,11 +55,9 @@ util.inherits(TemplateMaps, EventEmitter);
 module.exports = TemplateMaps;


-var o = TemplateMaps.prototype;
-
 //--------------- PRIVATE METHODS --------------------------------

-o._userTemplateLimit = function() {
+TemplateMaps.prototype._userTemplateLimit = function() {
  return this.opts.max_user_templates || 0;
 };

@@ -70,7 +68,7 @@ o._userTemplateLimit = function() {
 * @param redisArgs - the arguments for the redis function in an array
 * @param callback - function to pass results too.
 */
-o._redisCmd = function(redisFunc, redisArgs, callback) {
+TemplateMaps.prototype._redisCmd = function(redisFunc, redisArgs, callback) {
  var redisClient;
  var that = this;
  var db = that.db_signatures;
@@ -97,7 +95,7 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
 var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i;
 var _reValidPlaceholderIdentifier = /^[a-z][0-9a-z_]*$/i;
 // jshint maxcomplexity:15
-o._checkInvalidTemplate = function(template) {
+TemplateMaps.prototype._checkInvalidTemplate = function(template) {
  if ( template.version !== '0.0.1' ) {
    return new Error("Unsupported template version " + template.version);
  }
@@ -200,7 +198,7 @@ function templateDefaults(template) {
 // @param callback function(err, tpl_id)
 //        Return template identifier (only valid for given user)
 //
-o.addTemplate = function(owner, template, callback) {
+TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
    var self = this;

    template = templateDefaults(template);
@@ -258,7 +256,7 @@ o.addTemplate = function(owner, template, callback) {
 //
 // @param callback function(err)
 //
-o.delTemplate = function(owner, tpl_id, callback) {
+TemplateMaps.prototype.delTemplate = function(owner, tpl_id, callback) {
    var self = this;
    step(
        function deleteTemplate() {
@@ -297,7 +295,8 @@ o.delTemplate = function(owner, tpl_id, callback) {
 //
 // @param callback function(err)
 //
-o.updTemplate = function(owner, tpl_id, template, callback) {
+TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) {
+    
    var self = this;

    template = templateDefaults(template);
@@ -356,7 +355,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) {
 // @param callback function(err, tpl_id_list)
 //        Returns a list of template identifiers
 //
-o.listTemplates = function(owner, callback) {
+TemplateMaps.prototype.listTemplates = function(owner, callback) {
    this._redisCmd('HKEYS', [ this.key_usr_tpl({owner:owner}) ], callback);
 };

@@ -370,7 +369,7 @@ o.listTemplates = function(owner, callback) {
 // @param callback function(err, template)
 //        Return full template definition
 //
-o.getTemplate = function(owner, tpl_id, callback) {
+TemplateMaps.prototype.getTemplate = function(owner, tpl_id, callback) {
    var self = this;
    step(
        function getTemplate() {
@@ -386,7 +385,7 @@ o.getTemplate = function(owner, tpl_id, callback) {
    );
 };

-o.isAuthorized = function(template, authTokens) {
+TemplateMaps.prototype.isAuthorized = function(template, authTokens) {
    if (!template) {
        return false;
    }
@@ -438,7 +437,7 @@ function _replaceVars (str, params) {
    });
    return str;
 }
-o.instance = function(template, params) {
+TemplateMaps.prototype.instance = function(template, params) {
  var all_params = {};
  var phold = template.placeholders || {};
  Object.keys(phold).forEach(function(k) {
@@ -500,7 +499,7 @@ o.instance = function(template, params) {
 };

 // Return a fingerPrint of the object
-o.fingerPrint = function(template) {
+TemplateMaps.prototype.fingerPrint = function(template) {
  return crypto.createHash('md5')
    .update(JSON.stringify(template))
    .digest('hex')
--- a/lib/cartodb/backends/turbo-carto-postgres-datasource.js
+++ b/lib/cartodb/backends/turbo-carto-postgres-datasource.js
@@ -6,6 +6,9 @@ dot.templateSettings.strip = false;
 function createTemplate(method) {
    return dot.template([
        'SELECT',
+        'min({{=it._column}}) min_val,',
+        'max({{=it._column}}) max_val,',
+        'avg({{=it._column}}) avg_val,',
        method,
        'FROM ({{=it._sql}}) _table_sql WHERE {{=it._column}} IS NOT NULL'
    ].join('\n'));
@@ -29,17 +32,12 @@ methodTemplates.category = dot.template([
    '  SELECT {{=it._column}} AS category, count(1) AS value, row_number() OVER (ORDER BY count(1) desc) as rank',
    '  FROM ({{=it._sql}}) _cdb_aggregation_all',
    '  GROUP BY {{=it._column}}',
-    '  ORDER BY 2 DESC',
+    '  ORDER BY 2 DESC, 1 ASC',
    '),',
    'agg_categories AS (',
-    '  SELECT \'__other\' category',
+    '  SELECT category',
    '  FROM categories',
-    '  WHERE rank >= {{=it._buckets}}',
-    '  GROUP BY 1',
-    '  UNION ALL',
-    '  SELECT CAST(category AS text)',
-    '  FROM categories',
-    '  WHERE rank < {{=it._buckets}}',
+    '  WHERE rank <= {{=it._buckets}}',
    ')',
    'SELECT array_agg(category) AS category FROM agg_categories'
 ].join('\n'));
@@ -79,11 +77,14 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
            return callback(err);
        }

-        resultSet = resultSet || {};
-        var result = resultSet.rows || [];
-
+        var result = getResult(resultSet);
        var strategy = method2strategy[methodName];
-        var ramp = result[0][methodName] || [];
+        var ramp = result[methodName] || [];
+        var stats = {
+            min_val: result.min_val,
+            max_val: result.max_val,
+            avg_val: result.avg_val
+        };
        // Skip null values from ramp
        // Generated turbo-carto won't be correct, but better to keep it working than failing
        // TODO fix cartodb-postgres extension quantification functions
@@ -94,8 +95,16 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
            });
        }

-        return callback(null, { ramp: ramp, strategy: strategy });
+        return callback(null, { ramp: ramp, strategy: strategy, stats: stats });
    }, true); // use read-only transaction
 };

+function getResult(resultSet) {
+    resultSet = resultSet || {};
+    var result = resultSet.rows || [];
+    result = result[0] || {};
+
+    return result;
+}
+
 module.exports = PostgresDatasource;
--- a/lib/cartodb/controllers/analyses.js
+++ b/lib/cartodb/controllers/analyses.js
@@ -0,0 +1,169 @@
+var step = require('step');
+var assert = require('assert');
+var dot = require('dot');
+dot.templateSettings.strip = false;
+var PSQL = require('cartodb-psql');
+
+var util = require('util');
+var BaseController = require('./base');
+
+var cors = require('../middleware/cors');
+var userMiddleware = require('../middleware/user');
+
+function AnalysesController(authApi, pgConnection) {
+    BaseController.call(this, authApi, pgConnection);
+}
+
+util.inherits(AnalysesController, BaseController);
+
+module.exports = AnalysesController;
+
+AnalysesController.prototype.register = function(app) {
+    app.get(app.base_url_mapconfig + '/analyses/catalog', cors(), userMiddleware, this.catalog.bind(this));
+};
+
+AnalysesController.prototype.sendResponse = function(req, res, resource) {
+    res.set('Cache-Control', 'public,max-age=10,must-revalidate');
+    this.send(req, res, resource, 200);
+};
+
+AnalysesController.prototype.catalog = function(req, res) {
+    var self = this;
+    var username = req.context.user;
+
+    step(
+        function reqParams() {
+            self.req2params(req, this);
+        },
+        function catalogQuery(err) {
+            assert.ifError(err);
+            var pg = new PSQL(dbParamsFromReqParams(req.params));
+            getMetadata(username, pg, this);
+        },
+        function prepareResponse(err, results) {
+            assert.ifError(err);
+
+            var analysisIdToTable = results.tables.reduce(function(analysisIdToTable, table) {
+                var analysisId = table.relname.split('_')[2];
+                if (analysisId && analysisId.length === 40) {
+                    analysisIdToTable[analysisId] = table;
+                }
+                return analysisIdToTable;
+            }, {});
+
+            var catalogWithTables = results.catalog.map(function(analysis) {
+                if (analysisIdToTable.hasOwnProperty(analysis.node_id)) {
+                    analysis.table = analysisIdToTable[analysis.node_id];
+                }
+                return analysis;
+            });
+
+            return catalogWithTables.sort(function(analysisA, analysisB) {
+                if (!!analysisA.table && !!analysisB.table) {
+                    return analysisB.table.size - analysisA.table.size;
+                }
+
+                if (!!analysisA.table) {
+                    return -1;
+                }
+
+                if (!!analysisB.table) {
+                    return 1;
+                }
+
+                return -1;
+            });
+        },
+        function sendResponse(err, catalogWithTables) {
+            if (err) {
+                if (err.message.match(/permission\sdenied/)) {
+                    err = new Error('Unauthorized');
+                    err.http_status = 401;
+                }
+                self.sendError(req, res, err);
+            } else {
+                self.sendResponse(req, res, { catalog: catalogWithTables });
+            }
+        }
+    );
+};
+
+var catalogQueryTpl = dot.template(
+    'SELECT analysis_def->>\'type\' as type, * FROM cartodb.cdb_analysis_catalog WHERE username = \'{{=it._username}}\''
+);
+
+var tablesQueryTpl = dot.template([
+    "WITH analysis_tables AS (",
+    "    SELECT",
+    "        n.nspname AS nspname,",
+    "        c.relname AS relname,",
+    "        pg_total_relation_size(",
+    "            format('%s.%s', pg_catalog.quote_ident(n.nspname), pg_catalog.quote_ident(c.relname))",
+    "        ) AS size,",
+    "        format('%s.%s', pg_catalog.quote_ident(nspname), pg_catalog.quote_ident(relname)) AS fully_qualified_name",
+    "    FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n",
+    "    WHERE c.relnamespace = n.oid",
+    "    AND pg_catalog.quote_ident(c.relname) ~ '^analysis_[a-z0-9]{10}_[a-z0-9]{40}$'",
+    "    AND n.nspname IN ('{{=it._username}}', 'public')",
+    ")",
+    "SELECT *, pg_size_pretty(size) as size_pretty",
+    "FROM analysis_tables",
+    "ORDER BY size DESC"
+].join('\n'));
+
+
+function getMetadata(username, pg, callback) {
+    var results = {
+        catalog: [],
+        tables: []
+    };
+    step(
+        function getCatalog() {
+            pg.query(catalogQueryTpl({_username: username}), this, true); // use read-only transaction
+        },
+        function handleCatalog(err, resultSet) {
+            assert.ifError(err);
+            resultSet = resultSet || {};
+            results.catalog = resultSet.rows || [];
+            this();
+        },
+        function getTables(err) {
+            assert.ifError(err);
+            pg.query(tablesQueryTpl({_username: username}), this, true); // use read-only transaction
+        },
+        function handleTables(err, resultSet) {
+            assert.ifError(err);
+            resultSet = resultSet || {};
+            results.tables = resultSet.rows || [];
+            this();
+        },
+        function finish(err) {
+            if (err) {
+                return callback(err);
+            }
+
+            return callback(null, results);
+        }
+    );
+}
+
+
+function dbParamsFromReqParams(params) {
+    var dbParams = {};
+    if ( params.dbuser ) {
+        dbParams.user = params.dbuser;
+    }
+    if ( params.dbpassword ) {
+        dbParams.pass = params.dbpassword;
+    }
+    if ( params.dbhost ) {
+        dbParams.host = params.dbhost;
+    }
+    if ( params.dbport ) {
+        dbParams.port = params.dbport;
+    }
+    if ( params.dbname ) {
+        dbParams.dbname = params.dbname;
+    }
+    return dbParams;
+}
--- a/lib/cartodb/controllers/index.js
+++ b/lib/cartodb/controllers/index.js
@@ -1,4 +1,5 @@
 module.exports = {
+    Analyses: require('./analyses'),
    Layergroup: require('./layergroup'),
    Map: require('./map'),
    NamedMaps: require('./named_maps'),
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -1,4 +1,6 @@
 var _ = require('underscore');
+var dot = require('dot');
+dot.templateSettings.strip = false;
 var assert = require('assert');
 var step = require('step');
 var windshaft = require('windshaft');
@@ -44,6 +46,20 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
    this.layergroupAffectedTables = layergroupAffectedTables;

    this.mapConfigAdapter = mapConfigAdapter;
+
+    this.resourcesUrlTemplates = null;
+    if (global.environment.resources_url_templates) {
+        var templates = global.environment.resources_url_templates;
+
+        if (templates.http) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.http = dot.template(templates.http + '/{{=it.resource}}');
+        }
+        if (templates.https) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.https = dot.template(templates.https + '/{{=it.resource}}');
+        }
+    }
 }

 util.inherits(MapController, BaseController);
@@ -166,11 +182,30 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
        },
        function finish(err, layergroup) {
            if (err) {
+                if (Number.isFinite(err.layerIndex)) {
+                    var error = new Error(err.message);
+                    error.http_status = err.http_status;
+
+                    if (!err.http_status && err.message.indexOf('column "the_geom_webmercator" does not exist') >= 0) {
+                        error.http_status = 400;
+                    }
+
+                    error.type = 'layer';
+                    error.subtype = err.message.indexOf('Postgis Plugin') >= 0 ? 'query' : undefined;
+                    error.layer = {
+                        id: mapConfig.getLayerId(err.layerIndex),
+                        index: err.layerIndex,
+                        type: mapConfig.layerType(err.layerIndex)
+                    };
+
+                    err = error;
+                }
                self.sendError(req, res, err, 'ANONYMOUS LAYERGROUP');
            } else {
                var analysesResults = context.analysesResults || [];
-                addDataviewsAndWidgetsUrls(req.context.user, layergroup, mapConfig.obj());
-                addAnalysesMetadata(req.context.user, layergroup, analysesResults, true);
+                self.addDataviewsAndWidgetsUrls(req.context.user, layergroup, mapConfig.obj());
+                self.addAnalysesMetadata(req.context.user, layergroup, analysesResults, true);
+                addContextMetadata(layergroup, mapConfig.obj(), context);
                res.set('X-Layergroup-Id', layergroup.layergroupid);
                self.send(req, res, layergroup, 200);
            }
@@ -178,6 +213,17 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
    );
 };

+function addContextMetadata(layergroup, mapConfig, context) {
+    if (layergroup.metadata && Array.isArray(layergroup.metadata.layers) && Array.isArray(mapConfig.layers)) {
+        layergroup.metadata.layers = layergroup.metadata.layers.map(function(layer, layerIndex) {
+            if (context.turboCarto && Array.isArray(context.turboCarto.layers)) {
+                layer.meta.cartocss_meta = context.turboCarto.layers[layerIndex];
+            }
+            return layer;
+        });
+    }
+}
+
 MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn) {
    var self = this;

@@ -229,8 +275,10 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
                var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
                layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;

-                addDataviewsAndWidgetsUrls(cdbuser, layergroup, mapConfig.obj());
-                addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
+                var _mapConfig = mapConfig.obj();
+                self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
+                self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
+                addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);

                res.set('X-Layergroup-Id', layergroup.layergroupid);
                self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName()));
@@ -338,7 +386,7 @@ function getLastUpdatedTime(analysesResults, lastUpdateTime) {
    }, lastUpdateTime);
 }

-function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery) {
+MapController.prototype.addAnalysesMetadata = function(username, layergroup, analysesResults, includeQuery) {
    includeQuery = includeQuery || false;
    analysesResults = analysesResults || [];
    layergroup.metadata.analyses = [];
@@ -351,7 +399,7 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
                    var nodeResource = layergroup.layergroupid + '/analysis/node/' + node.id();
                    var nodeRepr = {
                        status: node.getStatus(),
-                        url: getUrls(username, nodeResource)
+                        url: this.getUrls(username, nodeResource)
                    };
                    if (includeQuery) {
                        nodeRepr.query = node.getQuery();
@@ -363,30 +411,30 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
                }

                return nodesIdMap;
-            }, {})
+            }.bind(this), {})
        });
-    });
-}
+    }.bind(this));
+};

 // TODO this should take into account several URL patterns
-function addDataviewsAndWidgetsUrls(username, layergroup, mapConfig) {
-    addDataviewsUrls(username, layergroup, mapConfig);
-    addWidgetsUrl(username, layergroup, mapConfig);
-}
+MapController.prototype.addDataviewsAndWidgetsUrls = function(username, layergroup, mapConfig) {
+    this.addDataviewsUrls(username, layergroup, mapConfig);
+    this.addWidgetsUrl(username, layergroup, mapConfig);
+};

-function addDataviewsUrls(username, layergroup, mapConfig) {
+MapController.prototype.addDataviewsUrls = function(username, layergroup, mapConfig) {
    layergroup.metadata.dataviews = layergroup.metadata.dataviews || {};
    var dataviews = mapConfig.dataviews || {};

    Object.keys(dataviews).forEach(function(dataviewName) {
        var resource = layergroup.layergroupid + '/dataview/' + dataviewName;
        layergroup.metadata.dataviews[dataviewName] = {
-            url: getUrls(username, resource)
+            url: this.getUrls(username, resource)
        };
-    });
-}
+    }.bind(this));
+};

-function addWidgetsUrl(username, layergroup, mapConfig) {
+MapController.prototype.addWidgetsUrl = function(username, layergroup, mapConfig) {
    if (layergroup.metadata && Array.isArray(layergroup.metadata.layers) && Array.isArray(mapConfig.layers)) {
        layergroup.metadata.layers = layergroup.metadata.layers.map(function(layer, layerIndex) {
            var mapConfigLayer = mapConfig.layers[layerIndex];
@@ -396,16 +444,19 @@ function addWidgetsUrl(username, layergroup, mapConfig) {
                    var resource = layergroup.layergroupid + '/' + layerIndex + '/widget/' + widgetName;
                    layer.widgets[widgetName] = {
                        type: mapConfigLayer.options.widgets[widgetName].type,
-                        url: getUrls(username, resource)
+                        url: this.getUrls(username, resource)
                    };
-                });
+                }.bind(this));
            }
            return layer;
-        });
+        }.bind(this));
    }
-}
+};

-function getUrls(username, resource) {
+MapController.prototype.getUrls = function(username, resource) {
+    if (this.resourcesUrlTemplates) {
+        return this.getUrlsFromTemplate(username, resource);
+    }
    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url;
    if (cdnUrl) {
        return {
@@ -418,4 +469,29 @@ function getUrls(username, resource) {
            http: 'http://' + username + '.' + 'localhost.lan:' + port +  '/api/v1/map/' + resource
        };
    }
-}
+};
+
+MapController.prototype.getUrlsFromTemplate = function(username, resource) {
+    var urls = {};
+    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url || {};
+
+    if (this.resourcesUrlTemplates.http) {
+        urls.http = this.resourcesUrlTemplates.http({
+            cdn_url: cdnUrl.http,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    if (this.resourcesUrlTemplates.https) {
+        urls.https = this.resourcesUrlTemplates.https({
+            cdn_url: cdnUrl.https,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    return urls;
+};
--- a/lib/cartodb/controllers/named_maps.js
+++ b/lib/cartodb/controllers/named_maps.js
@@ -137,9 +137,15 @@ NamedMapsController.prototype.staticMap = function(req, res) {
                this
            );
        },
-        function prepareImageOptions(err, _namedMapProvider) {
+        function prepareLayerVisibility(err, _namedMapProvider) {
            assert.ifError(err);
+
            namedMapProvider = _namedMapProvider;
+
+            self.prepareLayerFilterFromPreviewLayers(cdbUser, req, namedMapProvider, this);
+        },
+        function prepareImageOptions(err) {
+            assert.ifError(err);
            self.getStaticImageOptions(cdbUser, req.params, namedMapProvider, this);
        },
        function getImage(err, imageOpts) {
@@ -184,6 +190,45 @@ NamedMapsController.prototype.staticMap = function(req, res) {
    );
 };

+NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function (user, req, namedMapProvider, callback) {
+    var self = this;
+    namedMapProvider.getTemplate(function (err, template) {
+        if (err) {
+            return callback(err);
+        }
+
+        if (!template || !template.view || !template.view.preview_layers) {
+           return callback();
+        }
+
+        var previewLayers = template.view.preview_layers;
+        var layerVisibilityFilter = [];
+
+        template.layergroup.layers.forEach(function (layer, index) {
+            if (previewLayers[''+index] !== false && previewLayers[layer.id] !== false) {
+                layerVisibilityFilter.push(''+index);
+            }
+        });
+
+        if (!layerVisibilityFilter.length) {
+            return callback();
+        }
+
+        // overwrites 'all' default filter
+        req.params.layer = layerVisibilityFilter.join(',');
+
+        // recreates the provider
+        self.namedMapProviderCache.get(
+            user,
+            req.params.template_id,
+            req.query.config,
+            req.query.auth_token,
+            req.params,
+            callback
+        );
+    });
+};
+
 var DEFAULT_ZOOM_CENTER = {
    zoom: 1,
    center: {
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
@@ -33,7 +33,7 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function(user, requestMapConf
               step(
                   function collectFiltersData() {
                       var filters, unfiltered_query;
-                       if ( layer.options.source && analysesResults ) {
+                       if ( layer.options.source && analysesResults && !layer.options.sql_wrap) {
                           var sourceId = layer.options.source.id;
                           var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; });
                           if ( node ) {
--- a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
@@ -48,6 +48,11 @@ TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, par
        }

        requestMapConfig.layers = results.map(function(result) { return result.layer; });
+        context.turboCarto = {
+            layers: results.map(function(result) {
+                return result.meta;
+            })
+        };

        return callback(null, requestMapConfig);
    });
@@ -84,7 +89,7 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer,
    }

    var pg = new PSQL(dbParamsFromReqParams(params));
-    function processCallback(err, cartocss) {
+    function processCallback(err, cartocss, meta) {
        // Only return turbo-carto errors
        if (err && err.name === 'TurboCartoError') {
            var error = new Error(err.message);
@@ -105,7 +110,7 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer,
        if (cartocss) {
            layer.options.cartocss = cartocss;
        }
-        return callback(null, { layer: layer });
+        return callback(null, { layer: layer, meta: meta });
    }

    var layerSql = layer.options.sql;
--- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -120,6 +120,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
            self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, context.datasource);
            self.analysesResults = context.analysesResults || [];
            self.rendererParams = rendererParams;
+            self.context = context;
            self.context.limits = renderLimits || {};
            return callback(self.err, self.mapConfig, self.rendererParams, self.context);
        }
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -147,7 +147,8 @@ module.exports = function(serverOptions) {
    var tileBackend = new windshaft.backend.Tile(rendererCache);
    var mapValidatorBackend = new windshaft.backend.MapValidator(tileBackend, attributesBackend);
    var mapBackend = new windshaft.backend.Map(rendererCache, mapStore, mapValidatorBackend);
-    var analysisBackend = new AnalysisBackend(serverOptions.analysis);
+
+    var analysisBackend = new AnalysisBackend(metadataBackend, serverOptions.analysis);

    var layergroupAffectedTablesCache = new LayergroupAffectedTablesCache();
    app.layergroupAffectedTablesCache = layergroupAffectedTablesCache;
@@ -222,6 +223,8 @@ module.exports = function(serverOptions) {

    new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(app);

+    new controller.Analyses(authApi, pgConnection).register(app);
+
    new controller.ServerInfo(versions).register(app);

    /*******************************************************************************************************************
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -36,7 +36,11 @@ var analysisConfig = _.defaults(global.environment.analysis || {}, {
        inlineExecution: false,
        endpoint: 'http://127.0.0.1:8080/api/v2/sql/job',
        hostHeaderTemplate: '{{=it.username}}.localhost.lan'
-    }
+    },
+    logger: {
+        filename: undefined
+    },
+    limits: {}
 });

 module.exports = {
@@ -66,6 +70,7 @@ module.exports = {
        },
        datasource: global.environment.postgres,
        cachedir: global.environment.millstone.cache_basedir,
+        use_workers: rendererConfig.mapnik.useCartocssWorkers || false,
        mapnik_version: global.environment.mapnik_version,
        mapnik_tile_format: global.environment.mapnik_tile_format || 'png',
        default_layergroup_ttl: global.environment.mapConfigTTL || 7200
@@ -95,7 +100,11 @@ module.exports = {
            inlineExecution: analysisConfig.batch.inlineExecution,
            endpoint: analysisConfig.batch.endpoint,
            hostHeaderTemplate: analysisConfig.batch.hostHeaderTemplate
-        }
+        },
+        logger: {
+            filename: analysisConfig.logger.filename
+        },
+        limits: analysisConfig.limits
    },
    // Do not send unwatch on release. See http://github.com/CartoDB/Windshaft-cartodb/issues/161
    redis: _.extend(global.environment.redis, {unwatchOnRelease: false}),
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.64.0",
+  "version": "2.86.2",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,15 +20,15 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.36.0",
-    "cartodb-psql": "~0.6.1",
+    "camshaft": "0.48.4",
+    "cartodb-psql": "0.10.1",
    "cartodb-query-tables": "~0.1.0",
-    "cartodb-redis": "~0.13.0",
+    "cartodb-redis": "0.13.1",
    "debug": "~2.2.0",
    "dot": "~1.0.2",
    "express": "~4.13.3",
    "fastly-purge": "~1.0.1",
-    "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+    "log4js": "cartodb/log4js-node#cdb",
    "lru-cache": "2.6.5",
    "lzma": "~2.3.2",
    "node-statsd": "~0.0.7",
@@ -37,9 +37,10 @@
    "request": "~2.62.0",
    "step": "~0.0.6",
    "step-profiler": "~0.3.0",
-    "turbo-carto": "0.14.0",
+    "turbo-carto": "0.18.0",
    "underscore": "~1.6.0",
-    "windshaft": "2.4.0"
+    "windshaft": "2.6.3",
+    "yargs": "~5.0.0"
  },
  "devDependencies": {
    "istanbul": "~0.4.3",
--- a/test/acceptance/errors-with-context.js
+++ b/test/acceptance/errors-with-context.js
@@ -0,0 +1,68 @@
+var assert = require('../support/assert');
+var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
+var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
+var server = new CartodbWindshaft(serverOptions);
+
+describe('error with context', function () {
+    var layerOK = {
+        options: {
+            sql: 'select cartodb_id, ST_Translate(the_geom_webmercator, 5e6, 0) as the_geom_webmercator ' +
+                 'from test_table',
+            cartocss: '#layer { marker-fill:red; marker-width:32; marker-allow-overlap:true; }',
+            cartocss_version: '2.0.1',
+            interactivity: 'cartodb_id'
+        }
+    };
+    var layerKO = {
+        options: {
+            sql: 'select cartodb_id from test_table offset 3', // it doesn't return the_geom_webmercator so it must fail
+            cartocss: '#layer { marker-fill:blue; marker-allow-overlap:true; }',
+            cartocss_version: '2.0.2',
+            interactivity: 'cartodb_id'
+        }
+    };
+
+    var DB_ERROR_MESSAGE = 'Postgis Plugin: ERROR:  column "the_geom_webmercator" does not exist';
+    var scenarios = [{
+        description: 'layergroup with 2 layers, second one has query error',
+        layergroup: {
+            version: '1.0.0',
+            layers: [layerOK, layerKO]
+        },
+        expectedFailingLayer: { id: 'layer1', index: 1, type: 'mapnik' }
+    }, {
+        description: 'layergroup with 2 layers, first one has query error',
+        layergroup: {
+            version: '1.0.0',
+            layers: [layerKO, layerOK]
+        },
+        expectedFailingLayer: { id: 'layer0', index: 0, type: 'mapnik' }
+    }];
+
+    scenarios.forEach(function (scenario) {
+        it(scenario.description, function (done) {
+            assert.response(server, {
+                url: '/api/v1/map',
+                method: 'POST',
+                headers: {
+                    host: 'localhost',
+                    'Content-Type': 'application/json'
+                },
+                data: JSON.stringify(scenario.layergroup)
+            }, {
+                status: 400
+            }, function (res) {
+                var parsedBody = JSON.parse(res.body);
+
+                assert.ok(Array.isArray(parsedBody.errors_with_context));
+
+                var err = parsedBody.errors_with_context[0];
+                assert.equal(err.type, 'layer');
+                assert.equal(err.subtype, 'query');
+                assert.ok(err.message.indexOf(DB_ERROR_MESSAGE) >= 0);
+                assert.deepEqual(err.layer, scenario.expectedFailingLayer);
+                done();
+            });
+        });
+    });
+});
--- a/test/acceptance/named_layers_visibility.js
+++ b/test/acceptance/named_layers_visibility.js
@@ -0,0 +1,210 @@
+var step = require('step');
+var test_helper = require('../support/test_helper');
+
+var assert = require('../support/assert');
+var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
+var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
+var server = new CartodbWindshaft(serverOptions);
+
+var RedisPool = require('redis-mpool');
+var TemplateMaps = require('../../lib/cartodb/backends/template_maps.js');
+var mapnik = require('windshaft').mapnik;
+
+var IMAGE_TOLERANCE = 20;
+
+describe('layers visibility for previews', function() {
+    // configure redis pool instance to use in tests
+    var redisPool = new RedisPool(global.environment.redis);
+    var templateMaps = new TemplateMaps(redisPool, {
+        max_user_templates: global.environment.maxUserTemplates
+    });
+
+    var username = 'localhost';
+
+    function createLayer (color, layerId) {
+        var mod;
+
+        if (color === 'red') {
+            mod = 0;
+        } else if (color === 'orange') {
+            mod = 1;
+        } else if (color === 'blue') {
+            mod = 2;
+        } else {
+            mod = 0;
+        }
+
+        return {
+            type: 'mapnik',
+            id: layerId,
+            options: {
+                sql: 'select * from populated_places_simple_reduced where cartodb_id % 3 = ' + mod,
+                cartocss: '#layer { marker-fill: ' + color + '; }',
+                cartocss_version: '2.3.0'
+            }
+        };
+    }
+
+    function createTemplate(scenario) {
+        return {
+            version: '0.0.1',
+            name: scenario.name,
+            auth: {
+                method: 'open'
+            },
+            view: {
+                bounds: {
+                    west: 0,
+                    south: 0,
+                    east: 45,
+                    north: 45
+                },
+                zoom: 4,
+                center: {
+                    lng: 40,
+                    lat: 20
+                },
+                preview_layers: scenario.layerPerview
+            },
+            layergroup: {
+                layers: scenario.layers
+            }
+        };
+    }
+
+    afterEach(function (done) {
+        test_helper.deleteRedisKeys({
+            'user:localhost:mapviews:global': 5
+        }, done);
+    });
+
+    function previewFixture(version) {
+        return './test/fixtures/previews/populated_places_simple_reduced-' + version + '.png';
+    }
+
+    var threeLayerPointDistintColor = [
+        createLayer('red'),
+        createLayer('orange'),
+        createLayer('blue', 'layer2')
+    ];
+
+    var scenarios = [{
+        name: 'preview_layers_red',
+        layerPerview: {
+            '0': true,
+            '1': false,
+            'layer2': false
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_orange',
+        layerPerview: {
+            '0': false,
+            '1': true,
+            'layer2': false
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_blue',
+        layerPerview: {
+            '0': false,
+            '1': false,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_orange',
+        layerPerview: {
+            '0': true,
+            '1': true,
+            'layer2': false
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_blue',
+        layerPerview: {
+            '0': true,
+            '1': false,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_orange_blue',
+        layerPerview: {
+            '0': false,
+            '1': true,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_orange_blue',
+        layerPerview: {
+            '0': true,
+            '1': true,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_all',
+        layerPerview: {},
+        layers: threeLayerPointDistintColor
+    },  {
+        name: 'preview_layers_undefined',
+        layerPerview: undefined,
+        layers: threeLayerPointDistintColor
+    }];
+
+    scenarios.forEach(function (scenario) {
+        it('should filter layers for template: ' + scenario.name, function (done) {
+            step(
+                function addTemplate () {
+                    var next = this;
+                    var template = createTemplate(scenario);
+
+                    templateMaps.addTemplate(username, template, next);
+                },
+                function requestPreview (err) {
+                    assert.ifError(err);
+
+                    var next = this;
+
+                    assert.response(server, {
+                        url: '/api/v1/map/static/named/' + scenario.name + '/640/480.png',
+                        method: 'GET',
+                        headers: {
+                            host: 'localhost'
+                        },
+                        encoding: 'binary'
+                    }, {
+                        status: 200,
+                        headers: {
+                            'content-type': 'image/png'
+                        }
+                    }, function (res, err) {
+                        next(err, res);
+                    });
+                },
+                function checkPreview (err, res) {
+                    assert.ifError(err);
+
+                    var next = this;
+                    var img = mapnik.Image.fromBytes(new Buffer(res.body, 'binary'));
+                    var previewFixturePath = previewFixture(scenario.name);
+
+                    assert.imageIsSimilarToFile(img, previewFixturePath, IMAGE_TOLERANCE, next);
+                },
+                function deleteTemplate(err) {
+                    assert.ifError(err);
+
+                    var next = this;
+
+                    templateMaps.delTemplate(username, scenario.name, next);
+                },
+                function finish (err) {
+                    done(err);
+                }
+            );
+        });
+    });
+
+});
--- a/test/acceptance/turbo-cartocss/anonymous-maps.js
+++ b/test/acceptance/turbo-cartocss/anonymous-maps.js
--- a/test/acceptance/turbo-cartocss/error-cases.js
+++ b/test/acceptance/turbo-cartocss/error-cases.js
@@ -50,14 +50,14 @@ describe('turbo-carto error cases', function() {
    });

    it('should return invalid number of ramp error', function(done) {
-        this.testClient = new TestClient(makeMapconfig('ramp([pop_max], (8,24,96), (8,24,96,128))'));
+        this.testClient = new TestClient(makeMapconfig('ramp([pop_max], 8, 96, 3, (8,24,96,128))'));
        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {
            assert.ok(!err, err);

            assert.ok(layergroup.hasOwnProperty('errors'));
            assert.equal(layergroup.errors.length, 1);
-            assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/));
-            assert.ok(layergroup.errors[0].match(/invalid\sramp\slength/i));
+            assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/), layergroup.errors[0]);
+            assert.ok(layergroup.errors[0].match(/invalid\sramp\slength/i), layergroup.errors[0]);

            done();
        });
--- a/test/acceptance/turbo-cartocss/named-maps.js
+++ b/test/acceptance/turbo-cartocss/named-maps.js
--- a/test/acceptance/turbo-cartocss/regressions.js
+++ b/test/acceptance/turbo-cartocss/regressions.js
@@ -287,4 +287,97 @@ describe('turbo-carto regressions', function() {
        });
    });

+    var scenarios = [
+        {
+            desc: 'numeric datasource',
+            cartocss: [
+                "#points {",
+                "  marker-fill: ramp([scalerank], colorbrewer(Reds), category);",
+                "}"
+            ].join('\n'),
+            expected: [
+                '#points {',
+                '  marker-fill: #fee5d9;',
+                '  [ scalerank = 6 ] {',
+                '    marker-fill: #fcae91',
+                '  }',
+                '  [ scalerank = 8 ] {',
+                '    marker-fill: #fb6a4a',
+                '  }',
+                '  [ scalerank = 4 ] {',
+                '    marker-fill: #de2d26',
+                '  }',
+                '  [ scalerank = 10 ] {',
+                '    marker-fill: #a50f15',
+                '  }',
+                '}',
+            ].join('\n')
+        },
+        {
+            desc: 'string datasource',
+            cartocss: [
+                "#points {",
+                "  marker-fill: ramp([adm0name], colorbrewer(Reds), category);",
+                "}"
+            ].join('\n'),
+            expected: [
+                '#points {',
+                '  marker-fill: #fee5d9;',
+                '  [ adm0name = "Russia" ] {',
+                '    marker-fill: #fcae91',
+                '  }',
+                '  [ adm0name = "China" ] {',
+                '    marker-fill: #fb6a4a',
+                '  }',
+                '  [ adm0name = "Brazil" ] {',
+                '    marker-fill: #de2d26',
+                '  }',
+                '  [ adm0name = "Canada" ] {',
+                '    marker-fill: #a50f15',
+                '  }',
+                '}',
+            ].join('\n')
+        },
+        {
+            desc: 'numeric manual',
+            cartocss: [
+                "#points {",
+                "  marker-fill: ramp([scalerank], colorbrewer(Reds), (-1, 6, 8, 4, 10), category);",
+                "}"
+            ].join('\n'),
+            expected: [
+                '#points {',
+                '  marker-fill: #fee5d9;',
+                '  [ scalerank = 6 ] {',
+                '    marker-fill: #fcae91',
+                '  }',
+                '  [ scalerank = 8 ] {',
+                '    marker-fill: #fb6a4a',
+                '  }',
+                '  [ scalerank = 4 ] {',
+                '    marker-fill: #de2d26',
+                '  }',
+                '  [ scalerank = 10 ] {',
+                '    marker-fill: #a50f15',
+                '  }',
+                '}',
+            ].join('\n')
+        }
+    ];
+
+    scenarios.forEach(function(scenario) {
+        it('category ramps should use original type: ' + scenario.desc, function(done) {
+            var mapConfig = makeMapconfig('SELECT * FROM populated_places_simple_reduced', scenario.cartocss);
+            this.testClient = new TestClient(mapConfig);
+            this.testClient.getLayergroup(function(err, layergroup) {
+                assert.ok(!err, err);
+
+                assert.ok(layergroup.hasOwnProperty('layergroupid'));
+                assert.deepEqual(layergroup.metadata.layers[0].meta.cartocss, scenario.expected);
+
+                done();
+            });
+        });
+    });
+
 });
--- a/test/fixtures/analysis/named-map-buffer-static-preview.png
+++ b/test/fixtures/analysis/named-map-buffer-static-preview.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_all.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_all.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_blue.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_blue.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange_blue.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange_blue.png
--- a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_undefined.png
+++ b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_undefined.png
--- a/test/integration/analysis-backend-limits.js
+++ b/test/integration/analysis-backend-limits.js
@@ -0,0 +1,167 @@
+var testHelper = require('../support/test_helper');
+
+var assert = require('assert');
+var redis = require('redis');
+
+var RedisPool = require('redis-mpool');
+var cartodbRedis = require('cartodb-redis');
+
+var AnalysisBackend = require('../../lib/cartodb/backends/analysis');
+
+describe('analysis-backend limits', function() {
+
+    var redisClient;
+    var keysToDelete;
+    var user = 'localhost';
+
+    beforeEach(function() {
+        redisClient = redis.createClient(global.environment.redis.port);
+        keysToDelete = {};
+        var redisPool = new RedisPool(global.environment.redis);
+        this.metadataBackend = cartodbRedis({pool: redisPool});
+    });
+
+    afterEach(function(done) {
+        redisClient.quit(function() {
+            testHelper.deleteRedisKeys(keysToDelete, done);
+        });
+    });
+
+    function withAnalysesLimits(limits, callback) {
+        redisClient.SELECT(5, function(err) {
+            if (err) {
+                return callback(err);
+            }
+            var analysesLimitsKey = 'limits:analyses:' + user;
+            redisClient.HMSET([analysesLimitsKey].concat(limits), function(err) {
+                if (err) {
+                    return callback(err);
+                }
+                keysToDelete[analysesLimitsKey] = 5;
+                return callback();
+            });
+        });
+    }
+
+    it("should use limits from configuration", function(done) {
+        var analysisBackend = new AnalysisBackend(this.metadataBackend, {
+            limits: {
+                moran: { timeout: 5000 },
+                kmeans: { timeout: 5000 }
+            }
+        });
+        analysisBackend.getAnalysesLimits(user, function(err, result) {
+            assert.ok(!err, err);
+
+            assert.ok(result.analyses.moran);
+            assert.equal(result.analyses.moran.timeout, 5000);
+
+            assert.ok(result.analyses.kmeans);
+            assert.equal(result.analyses.kmeans.timeout, 5000);
+
+            done();
+        });
+    });
+
+    it("should use limits from redis", function(done) {
+        var self = this;
+        var limits = ['moran', 5000];
+
+        withAnalysesLimits(limits, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var analysisBackend = new AnalysisBackend(self.metadataBackend);
+            analysisBackend.getAnalysesLimits(user, function(err, result) {
+                assert.ok(!err, err);
+
+                assert.ok(result.analyses.moran);
+                assert.equal(result.analyses.moran.timeout, 5000);
+
+                done();
+            });
+        });
+    });
+
+    it("should use limits from redis and configuration, redis takes priority", function(done) {
+        var self = this;
+        var limits = ['moran', 5000];
+
+        withAnalysesLimits(limits, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 }
+                }
+            });
+            analysisBackend.getAnalysesLimits(user, function(err, result) {
+                assert.ok(!err, err);
+
+                assert.ok(result.analyses.moran);
+                assert.equal(result.analyses.moran.timeout, 5000);
+
+                done();
+            });
+        });
+    });
+
+    it("should use limits from redis and configuration, defaulting for values not present in redis", function(done) {
+        var self = this;
+        var limits = ['moran', 5000];
+
+        withAnalysesLimits(limits, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 },
+                    kmeans: { timeout: 1000 }
+                }
+            });
+            analysisBackend.getAnalysesLimits(user, function(err, result) {
+                assert.ok(!err, err);
+
+                assert.ok(result.analyses.moran);
+                assert.equal(result.analyses.moran.timeout, 5000);
+
+                assert.ok(result.analyses.kmeans);
+                assert.equal(result.analyses.kmeans.timeout, 1000);
+
+                done();
+            });
+        });
+    });
+
+    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();
+            });
+        });
+    });
+
+});
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -75,7 +75,7 @@ if test x"$PREPARE_PGSQL" = xyes; then
  dropdb "${TEST_DB}"
  createdb -Ttemplate_postgis -EUTF8 "${TEST_DB}" || die "Could not create test database"

-  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced'
+  LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced cdb_analysis_check'
  REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_OverviewsSupport CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ'

  CURL_ARGS=""
--- a/test/support/sql/analysis_catalog.sql
+++ b/test/support/sql/analysis_catalog.sql
@@ -26,5 +26,7 @@ CREATE TABLE IF NOT EXISTS
 -- last job modifying the node
    last_modified_by uuid,
 -- store error message for failures
-    last_error_message text
+    last_error_message text,
+-- cached tables involved in the analysis
+    cache_tables regclass[] NOT NULL DEFAULT '{}'
 );
--- a/test/support/sql/cdb_analysis_check.sql
+++ b/test/support/sql/cdb_analysis_check.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE FUNCTION CDB_CheckAnalysisQuota(table_name TEXT)
+RETURNS void AS
+$$
+BEGIN
+END;
+$$ LANGUAGE PLPGSQL;
--- a/test/support/sql/windshaft.test.sql
+++ b/test/support/sql/windshaft.test.sql
@@ -634,7 +634,8 @@ GRANT SELECT ON TABLE analysis_rent_listings TO :PUBLICUSER;
 --
 GRANT SELECT, UPDATE, INSERT, DELETE ON cdb_analysis_catalog TO :TESTUSER;

-create schema cdb_crankshaft;
+DROP EXTENSION IF EXISTS crankshaft;
+CREATE SCHEMA IF NOT EXISTS cdb_crankshaft;
 GRANT USAGE ON SCHEMA cdb_crankshaft TO :TESTUSER;
 CREATE TYPE kmeans_type as (cartodb_id numeric, cluster_no numeric);
 CREATE OR REPLACE FUNCTION cdb_crankshaft.CDB_KMeans(query text, no_clusters integer,no_init integer default 20)
Author	SHA1	Message	Date
Raul Ochoa	ac499eb0cd	Merge pull request #740 from CartoDB/2.86.1-fix-pg-vulnerability 2.86.1 fix pg vulnerability	2017-09-01 17:12:02 +02:00
Simon	8071967ff1	trying another travis configuration for postgres9.5	2017-09-01 13:11:28 +02:00
Simon	d47f1762da	Adding a new cartodb-psql fixing a pg vulnerability	2017-09-01 13:06:19 +02:00
Javier Goizueta	75fe4c8aed	Release 2.86.1	2016-12-02 15:19:29 +01:00
Javier Goizueta	12e272a7e5	Merge pull request #599 from CartoDB/597-overviews-sql_wrap Queries with sql_wrap should not be rewritten	2016-12-02 15:07:59 +01:00
Javier Goizueta	cfcba4e578	Wueries with sql_wrap should not be rewritten	2016-12-02 14:00:21 +01:00
Raul Ochoa	37ab898426	Stubs next version	2016-12-02 10:43:00 +01:00
Raul Ochoa	68865ea929	Release 2.86.0	2016-12-02 10:41:23 +01:00
Raul Ochoa	86674faa22	Update news and bump version	2016-12-02 10:41:02 +01:00
Raul Ochoa	f07947ce45	Merge pull request #597 from CartoDB/upgrade-windshaft Upgrade windshaft	2016-12-02 10:32:44 +01:00
Raul Ochoa	6a50f59e25	Regenerate npm-shrinkwrap.json	2016-12-01 17:13:32 +01:00
Raul Ochoa	bfacd56800	Allow to use workers for transforming cartocss into mapnik XML	2016-12-01 17:02:40 +01:00
Raul Ochoa	45dea8b0c1	Stubs next version	2016-11-30 11:09:18 +01:00
Raul Ochoa	2f7f8cf2d8	Release 2.85.1	2016-11-30 11:07:29 +01:00
Raul Ochoa	31611b6a28	Upgrades camshaft to 0.48.4	2016-11-30 10:59:44 +01:00
Raul Ochoa	d1cd4b0c2b	Stubs next version	2016-11-24 16:15:47 +01:00
Raul Ochoa	c8ba1c3e7c	Release 2.85.0	2016-11-24 16:14:48 +01:00
Raul Ochoa	fbc8fe4c2d	Update news and bump version	2016-11-24 16:11:08 +01:00
Raul Ochoa	54ec9b48db	Ignore vscode settings dir	2016-11-24 15:41:09 +01:00
Raul Ochoa	488698d5e2	Merge pull request #594 from CartoDB/resources-url-templates Allow to set resource URL templates with substitution tokens	2016-11-24 15:37:23 +01:00
Raul Ochoa	58c407aabb	Alternative development example configuration for user in path instead of host	2016-11-24 12:57:45 +01:00
Raul Ochoa	fe750f23bc	Closer to reality production example configuration	2016-11-24 12:56:38 +01:00
Raul Ochoa	87a01a5cfd	Example configuration with just HTTP	2016-11-24 12:56:02 +01:00
Javier Goizueta	74dd669bb0	Stub next version	2016-11-23 15:29:50 +01:00
Javier Goizueta	36a50389f5	Release 2.84.2	2016-11-23 15:09:24 +01:00
Javier Goizueta	4f2d7434c7	Merge pull request #596 from CartoDB/upgrade-camshaft-to-0.48.3 Upgrade Camshaft version to 0.48.3	2016-11-23 15:05:43 +01:00
Javier Goizueta	b0a0848476	Upgrade Camshaft version to 0.48.3	2016-11-23 13:17:16 +01:00
Javier Goizueta	9fcd897e54	Stub next version	2016-11-23 11:57:05 +01:00
Javier Goizueta	daa8fff21e	Release 2.84.1	2016-11-23 11:53:37 +01:00
Javier Goizueta	785229ddea	Merge pull request #595 from CartoDB/upgrade-camshaft-to-0.48.2 Upgrade camshaft version to 0.48.2	2016-11-23 11:50:45 +01:00
Javier Goizueta	8bb11bf1d4	Upgrade camshaft version to 0.48.2	2016-11-23 11:36:38 +01:00
Raul Ochoa	1f975e15c1	Default to empty object for cdn URLs	2016-11-22 17:01:34 +01:00
Raul Ochoa	6c69ba54db	Use actual CDN url for HTTP and HTTPS	2016-11-22 16:44:06 +01:00
Raul Ochoa	49f9904d00	Allow to set resource URL templates with substitution tokens	2016-11-22 16:41:31 +01:00
Raul Ochoa	7afd0dfa4e	Remove prototype reference	2016-11-22 13:38:56 +01:00
Raul Ochoa	b1b6a437a7	Merge pull request #593 from CartoDB/592-doc-preview-layers Fix DOC for named map and preview layers	2016-11-22 12:52:24 +01:00
Daniel García Aubert	e4d5006591	Merge branch 'master' into 592-doc-preview-layers	2016-11-22 11:06:18 +01:00
Daniel García Aubert	627b3771d3	Fix doc for layer preview	2016-11-22 11:04:38 +01:00
Raul Ochoa	f4758e84e8	Stubs next version	2016-11-11 16:17:20 +01:00
Raul Ochoa	8dfe2098ed	Release 2.84.0	2016-11-11 16:16:21 +01:00
Raul Ochoa	c56a4ee036	Update news and bump version	2016-11-11 16:15:59 +01:00
Raul Ochoa	c32623b821	Stubs next version	2016-11-11 16:15:08 +01:00
Raul Ochoa	3cd0a947f7	Merge pull request #586 from CartoDB/docs-switch-to-builder switched gui tool from editor to builder	2016-11-11 12:52:38 +01:00
Raul Ochoa	8eea1cf4e7	Merge pull request #590 from CartoDB/analyses-limits-configuration Analyses limit configuration allows to set other limits than timeout	2016-11-11 12:52:21 +01:00
Javier Goizueta	b5fccd5bbe	Merge pull request #589 from CartoDB/upgrade-camshaft-to-0.48.1 Release 2.83.1	2016-11-10 18:48:14 +01:00
Raul Ochoa	e74ce9dfd8	Analyses limit configuration allows to set other limits than timeout Configuration is now defined as a dictionary instead of just timeouts per analysis type	2016-11-10 18:41:59 +01:00
Javier Goizueta	3743365a83	Release 2.83.1 Upgrade camshaft to 0.48.1	2016-11-10 18:16:42 +01:00
Javier Goizueta	8aeb2173d1	Release 2.83.0	2016-11-10 13:02:39 +01:00
Javier Goizueta	9a2b17d952	Merge pull request #588 from CartoDB/upgrade-camshaft-to-0.48.0 Upgrade camshaft to 0.48.0	2016-11-10 12:47:18 +01:00
Javier Goizueta	6f54cce01a	Upgrade camshaft to 0.48.0 Upgrade camshaft to have analysis limits checking	2016-11-10 12:23:15 +01:00
Daniel García Aubert	6901b2049e	Release 2.82.0	2016-11-08 18:48:01 +01:00
Daniel García Aubert	d0dcc027df	Upgrade camshaft to version 0.47.0	2016-11-08 18:44:58 +01:00
Daniel García Aubert	b693005118	Stubs next version	2016-11-05 14:41:15 +01:00
Daniel García Aubert	ab4a0e836f	Release 2.81.1	2016-11-05 14:36:49 +01:00
Daniel	abe02db6c6	Merge pull request #585 from CartoDB/fix-map-validator-basemap Fix issues related to rollout	2016-11-05 14:35:06 +01:00
Daniel García Aubert	a2cd5dd32d	Upgrade camshaft and windshaft	2016-11-05 14:12:03 +01:00
Daniel García Aubert	49b46a6096	Use address column in styles	2016-11-05 11:43:39 +01:00
csobier	94f420ca3f	switched gui tool from editor to builder	2016-11-02 09:34:55 -04:00
Daniel García Aubert	5e530105df	Stubs next version	2016-11-02 14:30:11 +01:00
Daniel García Aubert	2f82d34c4b	Release 2.81.0	2016-11-02 10:36:19 +01:00
Daniel García Aubert	81fd01d0ac	Upgrade camshaft to 0.46.2	2016-11-01 14:49:13 +01:00
Daniel García Aubert	9faac9f9fe	Retrieve error with context if map validation fails	2016-11-01 11:00:58 +01:00
Daniel García Aubert	d04787a60c	Fix test	2016-10-31 22:48:09 +01:00
Daniel García Aubert	f5dbf94b52	Stubs next version	2016-10-26 14:47:59 +02:00
Daniel García Aubert	5bec2d9b15	Release 2.80.2	2016-10-26 14:34:24 +02:00
Daniel García Aubert	fe64f0c63c	Update NEWS	2016-10-26 14:30:56 +02:00
Daniel García Aubert	c20fd9691a	Fix order in categories query to make it compatible with lenyends	2016-10-26 13:16:24 +02:00
Daniel García Aubert	eb323fbff9	Merge branch 'master' of github.com:CartoDB/Windshaft-cartodb	2016-10-25 16:28:34 +02:00
Daniel García Aubert	211f6b9a74	Stubs next version	2016-10-25 16:27:53 +02:00
Daniel García Aubert	b6c003ec63	Stubs next version	2016-10-25 16:15:03 +02:00
Daniel García Aubert	93d4bf2a72	Release 2.80.1	2016-10-25 16:02:32 +02:00
Daniel García Aubert	c6cb573383	Since crankshaft is installed by default in template-postgis we have to remove it before running test	2016-10-25 15:55:24 +02:00
Daniel García Aubert	f4ce671ea4	Upgrade camshaft version to 0.46.1	2016-10-25 14:54:52 +02:00
Raul Ochoa	147f7cbabb	Stubs next version	2016-10-20 15:24:37 +02:00
Raul Ochoa	b05d5a141e	Release 2.80.0	2016-10-20 15:23:17 +02:00
Raul Ochoa	d34e0306f8	Update news	2016-10-20 15:22:16 +02:00
Raul Ochoa	bd9f48dd24	Merge pull request #579 from CartoDB/upgrade-camshaft-to-0.46.0 Upgrade camshaft to 0.46.0	2016-10-20 15:20:14 +02:00
Javier Goizueta	9805990d79	Update npm-shrinkwrap	2016-10-20 15:11:53 +02:00
Raul Ochoa	dbbe60967c	Bump version and update news	2016-10-20 15:04:46 +02:00
Raul Ochoa	0ef91c1904	Merge pull request #580 from CartoDB/analyses-config-limits Default analyses limits can be defined in configuration	2016-10-20 15:02:44 +02:00
Raul Ochoa	376573459c	Default analyses limits can be defined in configuration	2016-10-20 14:03:42 +02:00
Javier Goizueta	9c6d7c0ff9	Upgrade camshaft to 0.46.0 This version of camshaft requires a CDB_CheckAnalysisQuota function to check analysis cache quota.	2016-10-20 12:56:18 +02:00
Raul Ochoa	30a95b7da3	Stubs next version	2016-10-11 16:56:22 +02:00
Raul Ochoa	e6a60aef9a	Release 2.79.0	2016-10-11 16:55:15 +02:00
Raul Ochoa	5c2024581f	Bump version	2016-10-11 16:55:03 +02:00
Raul Ochoa	f7ea2bb51e	Merge pull request #578 from CartoDB/upgrade-turbo-carto Upgrades turbo-carto to 0.18.0	2016-10-11 16:53:39 +02:00
Raul Ochoa	3e4da8ab57	Upgrades turbo-carto to 0.18.0	2016-10-11 16:41:26 +02:00
Raul Ochoa	7352a28908	Fix variable assigning to itself	2016-10-11 16:01:43 +02:00
Raul Ochoa	d1928ee578	Merge pull request #577 from CartoDB/analysis-limits-configuration Retrieve analysis limits and pass them into camshaft	2016-10-11 16:00:07 +02:00
Raul Ochoa	cd978d7384	Retrieve analysis limits and pass them into camshaft	2016-10-11 15:46:11 +02:00
Raul Ochoa	cde0d8f5e2	Stubs next version	2016-09-30 18:26:33 +02:00
Raul Ochoa	7bacfcc2e4	Release 2.78.1	2016-09-30 18:25:00 +02:00
Raul Ochoa	241fe36103	Upgrades camshaft to 0.44.2	2016-09-30 18:24:44 +02:00
Raul Ochoa	441714a656	Stubs next version	2016-09-29 11:36:06 +02:00
Raul Ochoa	bd3fdb7f16	Release 2.78.0	2016-09-29 11:35:03 +02:00
Raul Ochoa	775af6feee	Merge pull request #575 from CartoDB/cartocss-meta Add metadata about processed turbo-carto rules	2016-09-28 19:44:52 +02:00
Raul Ochoa	adf5c17e0d	Use context from adapters as provider context	2016-09-28 19:22:03 +02:00
Raul Ochoa	beb2d96a32	Upgrades turbo-carto to 0.17.1	2016-09-28 19:21:43 +02:00
Raul Ochoa	2a4ae88bc0	Merge remote-tracking branch 'origin/master' into cartocss-meta	2016-09-28 17:06:36 +02:00
Raul Ochoa	b76098ba45	Upgrades turbo-carto to 0.17.0	2016-09-28 16:57:04 +02:00
Raul Ochoa	c095027f8e	Regenerate npm-shrinkwrap.json	2016-09-28 14:45:33 +02:00
Raul Ochoa	9d1db19907	Regenerate npm-shrinkwrap.json for turbo-carto dep	2016-09-28 11:39:58 +02:00
Daniel García Aubert	260e321537	Stub next version	2016-09-28 11:04:03 +02:00
Daniel García Aubert	073603b527	Release 2.77.1	2016-09-28 10:55:50 +02:00
Daniel García Aubert	17b259cf31	Upgrade camshaft to version 0.44.1	2016-09-28 10:54:27 +02:00
Daniel García Aubert	8f0f0026e9	Stubs next version	2016-09-27 12:28:44 +02:00
Daniel García Aubert	59dae2b545	Release 2.77.0	2016-09-26 19:11:12 +02:00
Daniel García Aubert	4670f69ead	Upgrade camshaft to version 0.44.0	2016-09-26 19:05:16 +02:00
Daniel	16fbd25a34	Merge pull request #576 from CartoDB/conf-analysis-logger Pass logger configuration to analysis backend and create a stream	2016-09-26 18:14:52 +02:00
Daniel García Aubert	2d75985cb3	Recreate stream on SIGHUP event	2016-09-26 17:39:27 +02:00
Daniel García Aubert	f963fb321e	Set default config of analysis logger for test env	2016-09-23 17:35:46 +02:00
Daniel García Aubert	10feea0d48	Pass logger configuration to analysis backend and create a stream based on config	2016-09-23 17:11:04 +02:00
Raul Ochoa	b6b9b0ac36	Regenerate npm-shrinkwrap	2016-09-21 17:13:59 +02:00
Raul Ochoa	5551e85853	Update news and bump version	2016-09-21 16:06:43 +02:00
Raul Ochoa	1f0fa5031b	Rely on turbo-carto metadata branch	2016-09-20 16:19:46 +02:00
Raul Ochoa	263294a3f5	Add metadata only for existing layers in turbocarto context	2016-09-20 16:19:22 +02:00
Raul Ochoa	f9df30f70b	Append turbo-carto metadata per layer	2016-09-20 16:09:21 +02:00
Raul Ochoa	61d31ec054	Handle metadata from turbo-carto	2016-09-20 16:08:53 +02:00
Raul Ochoa	c8917bfc4c	Return stats in callback	2016-09-20 16:00:33 +02:00
Raul Ochoa	36b69a05e5	Compute some stats in queries	2016-09-20 16:00:06 +02:00
Raul Ochoa	c8d2f66467	Stubs next version	2016-09-15 12:14:12 +02:00
Raul Ochoa	7416bb0e56	Release 2.76.0	2016-09-15 12:13:36 +02:00
Raul Ochoa	9182d0132d	Merge pull request #574 from CartoDB/travis-addon Travis' pg 9.5 addon	2016-09-15 11:17:51 +02:00
Raul Ochoa	9be9357ade	Add libpango	2016-09-15 01:57:49 +02:00
Raul Ochoa	7f414f8adf	Attempt to use travis' pg 9.5 addon	2016-09-15 01:51:36 +02:00
Raul Ochoa	3af9549939	Merge pull request #573 from CartoDB/external-config Allow to use `--config /path/to/config.js` to specify configuration file	2016-09-15 01:49:43 +02:00
Raul Ochoa	41f248d731	Use logError	2016-09-15 01:35:38 +02:00
Raul Ochoa	18a517b7bf	Allow to use `--config /path/to/config.js` to specify configuration file	2016-09-15 01:25:33 +02:00
Raul Ochoa	5150204389	Travis' Node.js 0.10 already uses npm 2.x	2016-09-14 21:22:40 +02:00
Raul Ochoa	3b16e7729d	Merge pull request #572 from CartoDB/logs-conf Allow to use absolute paths for log files	2016-09-14 21:04:19 +02:00
Raul Ochoa	76d27c9fce	Allow to use absolute paths for log files Fixes #570	2016-09-14 20:15:38 +02:00
Raul Ochoa	4ce6e41000	Stubs next version	2016-09-14 20:06:05 +02:00
Daniel García Aubert	33260cdbd9	Release 2.75.0	2016-09-14 09:48:20 +02:00
Raul Ochoa	85d81ba7fd	Upgrades camshaft to 0.42.2	2016-09-09 13:40:31 +02:00
Raul Ochoa	7e8a3ca21f	Stubs next version	2016-09-07 17:01:39 +02:00
Raul Ochoa	e9e4dc1f5c	Release 2.74.1	2016-09-07 17:00:23 +02:00
Raul Ochoa	17c30e165a	Upgrades camshaft to 0.42.1 Test fixture updated as it no longers generate bounds based on table estimated bounds	2016-09-07 16:43:18 +02:00
Daniel García Aubert	c45c6ceb15	Stubs next version	2016-09-06 19:10:58 +02:00
Daniel García Aubert	d73c2c465f	Release 2.74.0	2016-09-06 19:03:50 +02:00
Daniel	d4fc53939b	Merge pull request #568 from CartoDB/567-show-hide-named-maps Show & hide support in named maps	2016-09-06 18:53:23 +02:00
Daniel García Aubert	4becb65bec	Stubs next version	2016-09-06 16:33:21 +02:00
Daniel García Aubert	f64e16c790	Release 2.73.1	2016-09-06 16:27:12 +02:00
Daniel García Aubert	1772011627	Add missinng column in fixture table cdb_analysis_catalog	2016-09-06 16:19:06 +02:00
Raul Ochoa	5b8f785e2b	Regenerate npm-shrinkwrap.json	2016-09-06 16:01:05 +02:00
Daniel García Aubert	a0e3b77006	Release 2.73.0	2016-09-06 15:51:03 +02:00
Daniel García Aubert	908070ecd7	Fix jshint issue	2016-09-01 16:53:10 +02:00
Daniel García Aubert	7c6a58cd30	Made explicit to recreate named-map-provider	2016-09-01 16:42:06 +02:00
Daniel García Aubert	b0990a1132	Removed template-maps backend from named-maps controller	2016-09-01 16:31:30 +02:00
Daniel García Aubert	c6988cdb88	Improved and implemented new test for layer visibility suite	2016-09-01 12:37:56 +02:00
Daniel García Aubert	e0d304b033	Applied approach similar to static image options	2016-09-01 12:37:04 +02:00
Daniel García Aubert	e4a9f2d64c	Added template map as dependency of named maps controller	2016-09-01 12:35:35 +02:00
Daniel García Aubert	0236fe3ca9	Implemented new scenario	2016-08-31 20:41:07 +02:00
Daniel García Aubert	1bed8623a2	Overwrites rendererparams instead of layergroup in mapconfig	2016-08-31 20:40:55 +02:00
Daniel García Aubert	df7d957914	Implemented acceptance test for layer visibility in previews	2016-08-31 19:41:23 +02:00
Daniel García Aubert	30c4b00f33	New approach: decorates named_map_provider to return the with visible layers	2016-08-31 19:40:00 +02:00
Daniel García Aubert	ab27886460	Renamed option by for name maps template	2016-08-31 19:37:48 +02:00
Daniel García Aubert	31e18d04d7	Undo unneeded optimization	2016-08-31 13:57:28 +02:00
Daniel García Aubert	8155484510	Improved test visibility layer with layerId	2016-08-29 10:46:55 +02:00
Daniel García Aubert	b61f1d2b53	Attached `layer_visibility` property to the named template	2016-08-26 17:30:03 +02:00
Daniel García Aubert	2e274b936a	Improved test to check all possible values of visibility in named maps templates	2016-08-26 15:07:06 +02:00
Daniel García Aubert	bf3e311b57	Avoid unnecessary complexity	2016-08-26 14:46:23 +02:00
Daniel García Aubert	6a7613de6b	Improved layergroup instantiation to filter non visible layers	2016-08-26 14:42:33 +02:00
Daniel García Aubert	ee46549e04	First approach	2016-08-25 20:04:23 +02:00
Raul Ochoa	377f3d4aff	Removes constraint on filtered mapnik layers	2016-08-25 18:34:19 +02:00
Daniel García Aubert	752d47d71e	Stubs next version	2016-08-23 11:25:39 +02:00
Daniel García Aubert	367157b80c	Release 2.72.0	2016-08-23 11:19:48 +02:00
Daniel García Aubert	53542f1cd6	Stubs next version	2016-08-17 15:15:18 +02:00
Daniel García Aubert	7a8f156abf	Release 2.71.0	2016-08-17 15:12:42 +02:00
Daniel García Aubert	c60cc57a0d	Upgrades Windshaft to version 2.5.0	2016-08-17 15:07:29 +02:00
Raul Ochoa	8de6ec9a21	Stubs next version	2016-08-16 12:25:12 +02:00
Raul Ochoa	44b6f4be7e	Release 2.70.0	2016-08-16 12:24:23 +02:00
Raul Ochoa	280be1751c	Merge pull request #565 from CartoDB/update-camshaft Upgrade camshaft to 0.40.0	2016-08-16 12:19:25 +02:00
Raul Ochoa	701a73a2c5	Upgrade camshaft to 0.40.0	2016-08-16 11:33:32 +02:00
Raul Ochoa	b578eada07	Stubs next version	2016-08-12 10:34:33 +02:00
Raul Ochoa	8100f155dc	Release 2.69.1	2016-08-12 10:33:10 +02:00
Raul Ochoa	9f1a014004	Upgrades windshaft to 2.4.2	2016-08-12 10:24:06 +02:00
Raul Ochoa	e35e0e157c	Stubs next version	2016-08-11 12:06:33 +02:00
Raul Ochoa	3aff328af3	Release 2.69.0	2016-08-11 12:05:56 +02:00
Raul Ochoa	ffb086045a	Bump version	2016-08-11 12:05:37 +02:00
Raul Ochoa	c0786dfa6f	Merge pull request #564 from CartoDB/fix-travis Avoid 'No such file or directory'	2016-08-10 12:59:29 +02:00
Raul Ochoa	ddc33fa52b	Avoid 'No such file or directory'	2016-08-10 10:30:04 +02:00
Raul Ochoa	9f2d6a5d41	Merge pull request #563 from CartoDB/upgrade-camshaft Upgrade camshaft to 0.39.0	2016-08-09 17:01:09 +02:00
Raul Ochoa	64e884a092	force-yes for postgresql-plpython-9.5	2016-08-09 15:45:21 +02:00
Raul Ochoa	17ec174683	Use --force-yes	2016-08-09 15:41:17 +02:00
Raul Ochoa	3666cbee94	Upgrade camshaft to 0.39.0	2016-08-09 15:29:54 +02:00
Raul Ochoa	25de018f7d	Add comment about row_limit config parameter	2016-08-01 12:59:38 +02:00
Raul Ochoa	6597851b48	Stubs next version	2016-07-21 21:04:39 +02:00
Raul Ochoa	0399131968	Release 2.68.0	2016-07-21 21:03:10 +02:00
Raul Ochoa	86836e7f89	Upgrades turbo-carto to 0.16.0	2016-07-21 21:02:06 +02:00
Daniel García Aubert	df346b11d3	Release 2.67.1	2016-07-21 16:05:12 +02:00
Daniel García Aubert	27f74b3fe2	Stubs next version	2016-07-21 10:41:42 +02:00
Daniel García Aubert	87dec64ad1	Release 2.67.0	2016-07-21 10:34:10 +02:00
Daniel García Aubert	54c787162a	Update NEWS	2016-07-21 10:27:46 +02:00
Daniel García Aubert	6e92e699dc	Upgrades camshaft version to 0.38.0	2016-07-21 10:25:53 +02:00
Raul Ochoa	7950f43db3	Stubs next version	2016-07-20 19:38:09 +02:00
Raul Ochoa	d300677315	Release 2.66.2	2016-07-20 19:26:27 +02:00
Raul Ochoa	bd4d29dd14	Upgrades turbo-carto to 0.15.1	2016-07-20 19:25:53 +02:00
Raul Ochoa	18a84433f4	Merge pull request #562 from CartoDB/git-for-log4js-dep Use git for log4js dependency	2016-07-20 19:21:02 +02:00
Raul Ochoa	768ebf0ef2	Use git for log4js dependency	2016-07-20 18:34:57 +02:00
Raul Ochoa	1c20cb5478	Stubs next version	2016-07-20 11:20:12 +02:00
Raul Ochoa	279587ea11	Release 2.66.1	2016-07-20 11:16:23 +02:00
Raul Ochoa	25df193390	Merge pull request #560 from CartoDB/upgrade-turbo-carto Upgrades turbo-carto to 0.15.0	2016-07-19 20:03:30 +02:00
Raul Ochoa	9ce81693bd	Merge remote-tracking branch 'origin/master' into upgrade-turbo-carto Conflicts: npm-shrinkwrap.json	2016-07-19 19:46:19 +02:00
Raul Ochoa	16765e092f	Upgrades turbo-carto to 0.15.0	2016-07-19 19:28:53 +02:00
Daniel García Aubert	237e1257c4	Stubs next version	2016-07-18 13:34:14 +02:00
Daniel García Aubert	665859b17d	Release 2.66.0	2016-07-18 13:31:55 +02:00
Raul Ochoa	b5a6d6974c	Do not cast type in category ramp	2016-07-18 11:58:19 +02:00
Raul Ochoa	26bab029f4	Prepare for new turbo-carto versio	2016-07-18 11:57:27 +02:00
Raul Ochoa	ed7bb07b03	Output actual error message	2016-07-18 11:13:37 +02:00
Raul Ochoa	c87277ad01	Adjust to fail in specific scenario	2016-07-18 11:13:01 +02:00
Raul Ochoa	62be259a90	Rename turbo-cartocss -> turbo-carto	2016-07-18 10:29:13 +02:00
Daniel García Aubert	80798f984b	Stubs next version	2016-07-15 12:15:47 +02:00
Daniel García Aubert	e32409880c	Release 2.65.0	2016-07-15 12:07:37 +02:00
Daniel García Aubert	7b6eb2940e	Upgrades camshaft version to 0.37.0	2016-07-15 12:01:29 +02:00
Raul Ochoa	87ad8df22f	Merge pull request #557 from CartoDB/upgrade-cartodb-redis Upgrades cartodb-redis to 0.13.1	2016-07-13 16:19:19 +02:00
Raul Ochoa	9fe20036a1	Upgrades cartodb-redis to 0.13.1 Which removes strftime dependency Closes #285	2016-07-13 16:05:16 +02:00
Raul Ochoa	2b0d8d43bd	Merge pull request #555 from CartoDB/analyses-controller Add controller to list user analyses	2016-07-12 16:53:43 +02:00
Raul Ochoa	3af340d384	Add controller to list user analyses	2016-07-12 16:08:48 +02:00
Daniel García Aubert	20c1ad8d87	Stubs next version	2016-07-12 11:27:09 +02:00