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

remove some unnecessary calculations from obs_getgeometryscores, yields QPS improvement from about 20 to 30

Browse Source
This commit is contained in:
John Krauss 2016-12-09 21:06:42 +00:00
parent 6a6d1bc3e4
commit 95b6cba085
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pg/sql/42_observatory_exploration.sql
View File

@ -442,19 +442,20 @@ BEGIN
FROM ( FROM (
WITH clipped_geom AS ( WITH clipped_geom AS (
SELECT column_id, table_id SELECT column_id, table_id
, CASE WHEN $1 IS NOT NULL THEN ST_Clip(tile, 1, $1, True) --, CASE WHEN $1 IS NOT NULL THEN ST_Clip(tile, 2, $1, True)
, CASE WHEN $1 IS NOT NULL THEN ST_Clip(tile, $1, True)
ELSE tile END clipped_tile ELSE tile END clipped_tile
--, tile as clipped_tile --, tile as clipped_tile
, tile , tile
FROM observatory.obs_column_table_tile_simpler FROM observatory.obs_column_table_tile
WHERE ($1 IS NULL OR ST_Intersects($1, tile)) WHERE ($1 IS NULL OR ST_Intersects($1, tile))
AND (column_id = ANY($2) OR cardinality($2) = 0) AND (column_id = ANY($2) OR cardinality($2) = 0)
), clipped_geom_countagg AS ( ), clipped_geom_countagg AS (
SELECT column_id, table_id SELECT column_id, table_id
--, 10 notnull_pixels , ST_CountAgg(clipped_tile, 2, True)::Numeric notnull_pixels
--, 10 pixels , ST_CountAgg(clipped_tile, 2, False)::Numeric pixels
, ST_CountAgg(clipped_tile, 1, True)::Numeric notnull_pixels --, ST_CountAgg(clipped_tile, 1, True)::Numeric notnull_pixels
, ST_CountAgg(clipped_tile, 1, False)::Numeric pixels --, ST_CountAgg(clipped_tile, 1, False)::Numeric pixels
FROM clipped_geom FROM clipped_geom
GROUP BY column_id, table_id GROUP BY column_id, table_id
) SELECT ) SELECT
@ -463,19 +464,14 @@ BEGIN
THEN cdb_observatory.FIRST(notnull_pixels) / cdb_observatory.FIRST(pixels) THEN cdb_observatory.FIRST(notnull_pixels) / cdb_observatory.FIRST(pixels)
ELSE 1 ELSE 1
END)::Numeric AS notnull_percent END)::Numeric AS notnull_percent
--, null::numeric as notnull_percent
--, 10::numeric as numgeoms
, (CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0 , (CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0
THEN (ST_SummaryStatsAgg(clipped_tile, 1, True)).sum THEN (ST_SummaryStatsAgg(clipped_tile, 2, True)).sum
ELSE COALESCE(ST_Value(cdb_observatory.FIRST(tile), 1, ST_PointOnSurface($1)), 0) * (ST_Area($1) / ST_Area(ST_PixelAsPolygon(cdb_observatory.FIRST(tile), 0, 0)) * cdb_observatory.FIRST(pixels)) ELSE COALESCE(ST_Value(cdb_observatory.FIRST(tile), 2, ST_PointOnSurface($1)), 0) * (ST_Area($1) / ST_Area(ST_PixelAsPolygon(cdb_observatory.FIRST(tile), 0, 0)) * cdb_observatory.FIRST(pixels))
END)::Numeric AS numgeoms END)::Numeric AS numgeoms
, (CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0
, null::numeric as percentfill THEN (ST_SummaryStatsAgg(clipped_tile, 3, True)).mean
--, (CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0 ELSE COALESCE(ST_Value(cdb_observatory.FIRST(tile), 3, ST_PointOnSurface($1)), 0)
-- THEN (ST_SummaryStatsAgg(clipped_tile, 3, True)).mean END)::Numeric AS percentfill
-- ELSE COALESCE(ST_Value(cdb_observatory.FIRST(tile), 3, ST_PointOnSurface($1)), 0)
-- END)::Numeric AS percentfill
, null::numeric estnumgeoms, null::numeric meanmediansize , null::numeric estnumgeoms, null::numeric meanmediansize
--, ((ST_Area(ST_Transform($1, 3857)) / 1000000) / NullIf( --, ((ST_Area(ST_Transform($1, 3857)) / 1000000) / NullIf(
-- CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0 -- CASE WHEN cdb_observatory.FIRST(notnull_pixels) > 0