0a218da835
Use the Windshaft query-rewriter interface to adapt queries so they use available overview tables. This requires a version of Windshaft that implements the query-rewriter interface (package.json/npm-shrinkwap.json have yet to be updated)
88 lines
3.5 KiB
JavaScript
88 lines
3.5 KiB
JavaScript
require('../support/test_helper');
|
|
|
|
var assert = require('assert');
|
|
var RedisPool = require('redis-mpool');
|
|
var cartodbRedis = require('cartodb-redis');
|
|
var PgConnection = require(__dirname + '/../../lib/cartodb/backends/pg_connection');
|
|
var PgQueryRunner = require('../../lib/cartodb/backends/pg_query_runner');
|
|
var OverviewsMetadataApi = require('../../lib/cartodb/api/overviews_metadata_api');
|
|
var MapConfigOverviewsAdapter = require('../../lib/cartodb/models/mapconfig_overviews_adapter');
|
|
|
|
// configure redis pool instance to use in tests
|
|
var redisPool = new RedisPool(global.environment.redis);
|
|
var pgConnection = new PgConnection(require('cartodb-redis')({ pool: redisPool }));
|
|
|
|
var redisPool = new RedisPool(global.environment.redis);
|
|
var metadataBackend = cartodbRedis({pool: redisPool});
|
|
var pgConnection = new PgConnection(metadataBackend);
|
|
var pgQueryRunner = new PgQueryRunner(pgConnection);
|
|
var overviewsMetadataApi = new OverviewsMetadataApi(pgQueryRunner);
|
|
|
|
|
|
var mapConfigOverviewsAdapter = new MapConfigOverviewsAdapter(overviewsMetadataApi);
|
|
|
|
describe('MapConfigOverviewsAdapter', function() {
|
|
|
|
it('should not modify layers for which no overviews are available', function(done) {
|
|
var sql = 'SELECT * FROM test_table';
|
|
var cartocss = '#layer { marker-fill: black; }';
|
|
var cartocss_version = '2.3.0';
|
|
var layer_without_overviews = {
|
|
type: 'cartodb',
|
|
options: {
|
|
sql: sql,
|
|
cartocss: cartocss,
|
|
cartocss_version: cartocss_version
|
|
}
|
|
};
|
|
|
|
mapConfigOverviewsAdapter.getLayers('localhost', [layer_without_overviews], function(err, layers) {
|
|
assert.ok(!err);
|
|
assert.equal(layers.length, 1);
|
|
assert.equal(layers[0].type, 'cartodb');
|
|
assert.equal(layers[0].options.sql, sql);
|
|
assert.equal(layers[0].options.cartocss, cartocss);
|
|
assert.equal(layers[0].options.cartocss_version, cartocss_version);
|
|
assert.equal(layers[0].options.overviews, undefined);
|
|
done();
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('MapConfigOverviewsAdapter', function() {
|
|
|
|
it('should add overviews metadata for layers using tables with overviews', function(done) {
|
|
var sql = 'SELECT * FROM test_table_overviews';
|
|
var cartocss = '#layer { marker-fill: black; }';
|
|
var cartocss_version = '2.3.0';
|
|
var layer_without_overviews = {
|
|
type: 'cartodb',
|
|
options: {
|
|
sql: sql,
|
|
cartocss: cartocss,
|
|
cartocss_version: cartocss_version
|
|
}
|
|
};
|
|
|
|
mapConfigOverviewsAdapter.getLayers('localhost', [layer_without_overviews], function(err, layers) {
|
|
assert.ok(!err);
|
|
assert.equal(layers.length, 1);
|
|
assert.equal(layers[0].type, 'cartodb');
|
|
assert.equal(layers[0].options.sql, sql);
|
|
assert.equal(layers[0].options.cartocss, cartocss);
|
|
assert.equal(layers[0].options.cartocss_version, cartocss_version);
|
|
assert.ok(layers[0].options.query_rewrite_data);
|
|
var expected_data = {
|
|
overviews: {
|
|
test_table_overviews: {
|
|
1: { table: '_vovw_1_test_table_overviews' },
|
|
2: { table: '_vovw_2_test_table_overviews' }
|
|
}
|
|
}
|
|
};
|
|
assert.deepEqual(layers[0].options.query_rewrite_data, expected_data);
|
|
done();
|
|
});
|
|
});
|
|
});
|