From 432b5baac775189357c9e949fc1d89ceb88adca8 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Fri, 3 Jan 2020 11:57:16 +0100 Subject: [PATCH] Normalize tests: shard table names for custom_aggregate_support --- src/test/regress/bin/normalize.sed | 6 +- .../expected/custom_aggregate_support.out | 64 +++++++++---------- .../expected/custom_aggregate_support_1.out | 64 +++++++++---------- 3 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 426a03fad..809698618 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -27,9 +27,9 @@ s/\(ref_id\)=\([0-9]+\)/(ref_id)=(X)/g # shard table names for multi_subtransactions s/"t2_[0-9]+"/"t2_xxxxxxx"/g -# -## shard table names for custom_aggregate_support -#s/ daily_uniques_[0-9]+ / daily_uniques_xxxxxxx /g + +# shard table names for custom_aggregate_support +s/ daily_uniques_[0-9]+ / daily_uniques_xxxxxxx /g # ## In foreign_key_restriction_enforcement, normalize shard names #s/"(on_update_fkey_table_|fkey_)[0-9]+"/"\1xxxxxxx"/g diff --git a/src/test/regress/expected/custom_aggregate_support.out b/src/test/regress/expected/custom_aggregate_support.out index 3a17cf8e0..1c42b8def 100644 --- a/src/test/regress/expected/custom_aggregate_support.out +++ b/src/test/regress/expected/custom_aggregate_support.out @@ -117,22 +117,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) SET hll.force_groupagg to ON; @@ -151,22 +151,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) -- Test disabling hash_agg with operator on coordinator query @@ -186,22 +186,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) SET hll.force_groupagg to ON; @@ -220,22 +220,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) -- Test disabling hash_agg with expression on coordinator query @@ -255,22 +255,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) SET hll.force_groupagg to ON; @@ -289,22 +289,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) -- Test disabling hash_agg with having @@ -324,22 +324,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (23 rows) SET hll.force_groupagg to ON; @@ -360,25 +360,25 @@ HAVING hll_cardinality(hll_union_agg(unique_users)) > 1; -> HashAggregate Group Key: day Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) - -> Seq Scan on daily_uniques_360615 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) - -> Seq Scan on daily_uniques_360616 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) - -> Seq Scan on daily_uniques_360617 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) - -> Seq Scan on daily_uniques_360618 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (27 rows) DROP TABLE raw_table; diff --git a/src/test/regress/expected/custom_aggregate_support_1.out b/src/test/regress/expected/custom_aggregate_support_1.out index fa0c82288..499252779 100644 --- a/src/test/regress/expected/custom_aggregate_support_1.out +++ b/src/test/regress/expected/custom_aggregate_support_1.out @@ -119,22 +119,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (25 rows) SET hll.force_groupagg to ON; @@ -157,22 +157,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (27 rows) -- Test disabling hash_agg with operator on coordinator query @@ -194,22 +194,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (25 rows) SET hll.force_groupagg to ON; @@ -232,22 +232,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (27 rows) -- Test disabling hash_agg with expression on coordinator query @@ -269,22 +269,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (25 rows) SET hll.force_groupagg to ON; @@ -307,22 +307,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (27 rows) -- Test disabling hash_agg with having @@ -344,22 +344,22 @@ GROUP BY(1); Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> HashAggregate Group Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (25 rows) SET hll.force_groupagg to ON; @@ -387,7 +387,7 @@ HAVING hll_cardinality(hll_union_agg(unique_users)) > 1; Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) -> Sort Sort Key: day - -> Seq Scan on daily_uniques_360261 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> GroupAggregate @@ -395,7 +395,7 @@ HAVING hll_cardinality(hll_union_agg(unique_users)) > 1; Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) -> Sort Sort Key: day - -> Seq Scan on daily_uniques_360262 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> GroupAggregate @@ -403,7 +403,7 @@ HAVING hll_cardinality(hll_union_agg(unique_users)) > 1; Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) -> Sort Sort Key: day - -> Seq Scan on daily_uniques_360263 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques -> Task Node: host=localhost port=xxxxx dbname=regression -> GroupAggregate @@ -411,7 +411,7 @@ HAVING hll_cardinality(hll_union_agg(unique_users)) > 1; Filter: (hll_cardinality(hll_union_agg(unique_users)) > '1'::double precision) -> Sort Sort Key: day - -> Seq Scan on daily_uniques_360264 daily_uniques + -> Seq Scan on daily_uniques_xxxxxxx daily_uniques (40 rows) DROP TABLE raw_table;