cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove use of first aggregator in sample-cluster overviews strategy

Browse Source 
This is not more efficient but the geometry now corresponds to the cartodb_id
and the dependency with custom aggregators (firt) is removed.
This commit is contained in:
Javier Goizueta 2016-11-29 14:08:08 +01:00
parent 5992304b47
commit f58f870457
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts-available/CDB_Overviews.sql
View File

@ -932,8 +932,6 @@ AS $$
$$ LANGUAGE PLPGSQL; $$ LANGUAGE PLPGSQL;
-- This strategy places the aggregation of each cluster at the position of one of the cluster members. -- This strategy places the aggregation of each cluster at the position of one of the cluster members.
-- TODO: the location and the cartodb_id should be chosen to correspond to the same record;
-- a more efficient alternative to the `first` aggregator should be used
CREATE OR REPLACE FUNCTION _CDB_GridClusterSample_Reduce_Strategy(reloid REGCLASS, ref_z INTEGER, overview_z INTEGER, grid_px FLOAT8 DEFAULT NULL) CREATE OR REPLACE FUNCTION _CDB_GridClusterSample_Reduce_Strategy(reloid REGCLASS, ref_z INTEGER, overview_z INTEGER, grid_px FLOAT8 DEFAULT NULL)
RETURNS REGCLASS RETURNS REGCLASS
AS $$ AS $$
@ -1032,15 +1030,17 @@ AS $$
SELECT SELECT
%5$s %5$s
count(*) AS n, count(*) AS n,
first(the_geom) as the_geom, Floor(ST_X(_f.the_geom_webmercator)/%2$s)::int AS gx,
first(the_geom_webmercator) as the_geom_webmercator, Floor(ST_Y(_f.the_geom_webmercator)/%2$s)::int AS gy,
Floor(ST_X(f.the_geom_webmercator)/%2$s)::int AS gx,
Floor(ST_Y(f.the_geom_webmercator)/%2$s)::int AS gy,
MIN(cartodb_id) AS cartodb_id MIN(cartodb_id) AS cartodb_id
FROM %1$s f FROM %1$s _f
GROUP BY gx, gy GROUP BY gx, gy
),
cluster_geom AS (
SELECT the_geom, the_geom_webmercator, clusters.*
FROM clusters INNER JOIN %1$s _g ON (clusters.cartodb_id = _g.cartodb_id)
) )
SELECT %6$s FROM clusters SELECT %6$s FROM cluster_geom
', reloid::text, grid_m, overview_rel, attributes, aggr_attributes, columns, schema_name); ', reloid::text, grid_m, overview_rel, attributes, aggr_attributes, columns, schema_name);
RETURN Format('%I.%I', schema_name, overview_rel)::regclass; RETURN Format('%I.%I', schema_name, overview_rel)::regclass;