cartodb4/observatory-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix performance regression on getboundariesbygeometry, where pct overlap was being unnecessarily calculated

Browse Source
This commit is contained in:
John Krauss
2017-03-09 21:26:53 +00:00
parent 3ff1b36d7f
commit d5e7d95824
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pg/sql/41_observatory_augmentation.sql
View File

@@ -585,9 +585,9 @@ BEGIN
SELECT
String_Agg(DISTINCT
CASE
WHEN numer_id IS NULL THEN ''
WHEN $2 = 'ST_Point' THEN
'1 AS pct_' || geom_tablename ||
', ' || geom_tablename || '.' || geom_colname || ' AS geom_' || geom_tablename
'1 AS pct_' || geom_tablename || ', '
ELSE
'CASE WHEN ST_Within(_geoms.geom, ' || geom_tablename || '.' || geom_colname || ') ' ||
' THEN ST_Area(_geoms.geom) / Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0)' ||
@@ -596,9 +596,8 @@ BEGIN
' ELSE ST_Area(cdb_observatory.safe_intersection(_geoms.geom, ' ||
geom_tablename || '.' || geom_colname || ')) / ' ||
'Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0) ' ||
'END pct_' || geom_tablename ||
', ' || geom_tablename || '.' || geom_colname || ' AS geom_' || geom_tablename
END
'END pct_' || geom_tablename || ', '
END || geom_tablename || '.' || geom_colname || ' AS geom_' || geom_tablename
, ', ') AS geom_colspecs,
String_Agg(DISTINCT 'observatory.' || geom_tablename, ', ') AS geom_tables,
String_Agg(