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

Fix category columns aggregation in overviews

Browse Source 
Overviews are created in cascade, each one from the inmediate
lower level, but the stats to decide if a column is a category
should be taken always from the base table.
This commit is contained in:
Javier Goizueta 2016-04-26 18:02:25 +02:00
parent 9a73703954
commit 417cbe7902
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts-available/CDB_Overviews.sql
View File

@ -88,6 +88,26 @@ AS $$
END; END;
$$ LANGUAGE PLPGSQL IMMUTABLE; $$ LANGUAGE PLPGSQL IMMUTABLE;
CREATE OR REPLACE FUNCTION _CDB_OverviewBaseTable(overview_table REGCLASS)
RETURNS REGCLASS
AS $$
DECLARE
table_name TEXT;
schema_name TEXT;
base_name TEXT;
base_table REGCLASS;
BEGIN
SELECT * FROM _cdb_split_table_name(overview_table) INTO schema_name, table_name;
base_name := CDB_OverviewBaseTableName(table_name);
IF base_name != table_name THEN
base_table := Format('%I.%I', schema_name, base_name)::regclass;
ELSE
base_table := overview_table;
END IF;
RETURN base_table;
END;
$$ LANGUAGE PLPGSQL IMMUTABLE;
-- Schema and relation names of a table given its reloid -- Schema and relation names of a table given its reloid
-- Scope: private. -- Scope: private.
-- Parameters -- Parameters
@ -586,6 +606,7 @@ DECLARE
has_counter_column BOOLEAN; has_counter_column BOOLEAN;
feature_count TEXT; feature_count TEXT;
total_feature_count TEXT; total_feature_count TEXT;
base_table REGCLASS;
BEGIN BEGIN
IF table_alias <> '' THEN IF table_alias <> '' THEN
qualified_column := Format('%I.%I', table_alias, column_name); qualified_column := Format('%I.%I', table_alias, column_name);
@ -606,22 +627,24 @@ BEGIN
total_feature_count := 'count(*)'; total_feature_count := 'count(*)';
END IF; END IF;
base_table := _CDB_OverviewBaseTable(reloid);
CASE column_type CASE column_type
WHEN 'double precision', 'real', 'integer', 'bigint', 'numeric' THEN WHEN 'double precision', 'real', 'integer', 'bigint', 'numeric' THEN
IF column_name = '_feature_count' THEN IF column_name = '_feature_count' THEN
RETURN 'SUM(_feature_count)'; RETURN 'SUM(_feature_count)';
ELSE ELSE
IF column_type = 'integer' AND _cdb_categorical_column(reloid, column_name) THEN IF column_type = 'integer' AND _cdb_categorical_column(base_table, column_name) THEN
RETURN Format('CDB_Math_Mode(%s)::', qualified_column) || column_type; RETURN Format('CDB_Math_Mode(%s)::', qualified_column) || column_type;
ELSE ELSE
RETURN Format('SUM(%s*%s)/%s::' || column_type, qualified_column, feature_count, total_feature_count); RETURN Format('SUM(%s*%s)/%s::' || column_type, qualified_column, feature_count, total_feature_count);
END IF; END IF;
END IF; END IF;
WHEN 'text', 'character varying', 'character' THEN WHEN 'text', 'character varying', 'character' THEN
IF _cdb_categorical_column(reloid, column_name) THEN IF _cdb_categorical_column(base_table, column_name) THEN
RETURN Format('_cdb_mode(%s)::', qualified_column) || column_type; RETURN Format('_cdb_mode(%s)::', qualified_column) || column_type;
ELSE ELSE
IF _cdb_unlimited_text_column(reloid, column_name) THEN IF _cdb_unlimited_text_column(base_table, column_name) THEN
-- TODO: this should not be applied to columns containing largish text; -- TODO: this should not be applied to columns containing largish text;
-- it is intended only to short names/identifiers -- it is intended only to short names/identifiers
RETURN 'CASE WHEN count(distinct ' || qualified_column || ') = 1 THEN MIN(' || qualified_column || ') WHEN ' || total_feature_count || ' < 5 THEN string_agg(distinct ' || qualified_column || ','' / '') ELSE ''*'' END::' || column_type; RETURN 'CASE WHEN count(distinct ' || qualified_column || ') = 1 THEN MIN(' || qualified_column || ') WHEN ' || total_feature_count || ' < 5 THEN string_agg(distinct ' || qualified_column || ','' / '') ELSE ''*'' END::' || column_type;
@ -778,7 +801,7 @@ AS $$
IF NOT columns LIKE '%_feature_count%' THEN IF NOT columns LIKE '%_feature_count%' THEN
columns := columns || ', n AS _feature_count'; columns := columns || ', n AS _feature_count';
END IF; END IF
EXECUTE Format('DROP TABLE IF EXISTS %I.%I CASCADE;', schema_name, overview_rel); EXECUTE Format('DROP TABLE IF EXISTS %I.%I CASCADE;', schema_name, overview_rel);