From d6cb88a73ad220d909d068c76999680957e195e0 Mon Sep 17 00:00:00 2001 From: Burak Yucesoy Date: Wed, 12 Apr 2017 11:47:13 +0300 Subject: [PATCH] Stabilize test outputs --- src/test/regress/expected/multi_explain.out | 46 ++++++++----------- src/test/regress/expected/multi_explain_0.out | 46 ++++++++----------- src/test/regress/input/multi_load_data.source | 2 - .../regress/input/multi_load_more_data.source | 2 - .../input/multi_outer_join_reference.source | 3 +- .../regress/output/multi_load_data.source | 3 -- .../output/multi_load_more_data.source | 3 -- .../output/multi_outer_join_reference.source | 23 +++++----- src/test/regress/sql/multi_explain.sql | 4 ++ 9 files changed, 58 insertions(+), 74 deletions(-) diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index 5fa8ea4a3..e3ae6bfd3 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -34,6 +34,9 @@ BEGIN RETURN result; END; $BODY$ LANGUAGE plpgsql; +-- VACUMM related tables to ensure test outputs are stable +VACUUM ANALYZE lineitem; +VACUUM ANALYZE orders; -- Test Text format EXPLAIN (COSTS FALSE, FORMAT TEXT) SELECT l_quantity, count(*) count_quantity FROM lineitem @@ -287,12 +290,13 @@ Limit -> Limit -> Sort Sort Key: lineitem.l_quantity - -> Hash Join - Hash Cond: (lineitem.l_orderkey = orders.o_orderkey) - -> Seq Scan on lineitem_290001 lineitem - Filter: (l_quantity < 5.0) - -> Hash - -> Seq Scan on orders_290008 orders + -> Merge Join + Merge Cond: (orders.o_orderkey = lineitem.l_orderkey) + -> Index Scan using orders_pkey_290008 on orders_290008 orders + -> Sort + Sort Key: lineitem.l_orderkey + -> Seq Scan on lineitem_290001 lineitem + Filter: (l_quantity < 5.0) -- Test insert EXPLAIN (COSTS FALSE) INSERT INTO lineitem VALUES(1,0); @@ -314,11 +318,9 @@ Custom Scan (Citus Router) -> Task Node: host=localhost port=57638 dbname=regression -> Update on lineitem_290000 - -> Bitmap Heap Scan on lineitem_290000 - Recheck Cond: (l_orderkey = 1) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 + Index Cond: (l_orderkey = 1) Filter: (l_partkey = 0) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 1) -- Test delete EXPLAIN (COSTS FALSE) DELETE FROM lineitem @@ -329,11 +331,9 @@ Custom Scan (Citus Router) -> Task Node: host=localhost port=57638 dbname=regression -> Delete on lineitem_290000 - -> Bitmap Heap Scan on lineitem_290000 - Recheck Cond: (l_orderkey = 1) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 + Index Cond: (l_orderkey = 1) Filter: (l_partkey = 0) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 1) -- Test single-shard SELECT EXPLAIN (COSTS FALSE) SELECT l_quantity FROM lineitem WHERE l_orderkey = 5; @@ -342,10 +342,8 @@ Custom Scan (Citus Router) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem + Index Cond: (l_orderkey = 5) SELECT true AS valid FROM explain_xml($$ SELECT l_quantity FROM lineitem WHERE l_orderkey = 5$$); t @@ -646,10 +644,8 @@ Custom Scan (Citus Router) (cost=0.00..0.00 rows=0 width=0) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem (cost=4.30..13.44 rows=3 width=18) - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 (cost=0.00..4.30 rows=3 width=0) - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem (cost=0.28..11.83 rows=3 width=5) + Index Cond: (l_orderkey = 5) PREPARE real_time_executor_query AS SELECT avg(l_linenumber) FROM lineitem WHERE l_orderkey > 9030; EXPLAIN (COSTS FALSE) EXECUTE real_time_executor_query; @@ -671,7 +667,5 @@ Custom Scan (Citus Router) (cost=0.00..0.00 rows=0 width=0) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem (cost=4.30..13.44 rows=3 width=18) - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 (cost=0.00..4.30 rows=3 width=0) - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem (cost=0.28..11.83 rows=3 width=5) + Index Cond: (l_orderkey = 5) diff --git a/src/test/regress/expected/multi_explain_0.out b/src/test/regress/expected/multi_explain_0.out index 69eb07d04..c7f7166a3 100644 --- a/src/test/regress/expected/multi_explain_0.out +++ b/src/test/regress/expected/multi_explain_0.out @@ -34,6 +34,9 @@ BEGIN RETURN result; END; $BODY$ LANGUAGE plpgsql; +-- VACUMM related tables to ensure test outputs are stable +VACUUM ANALYZE lineitem; +VACUUM ANALYZE orders; -- Test Text format EXPLAIN (COSTS FALSE, FORMAT TEXT) SELECT l_quantity, count(*) count_quantity FROM lineitem @@ -266,12 +269,13 @@ Limit -> Limit -> Sort Sort Key: lineitem.l_quantity - -> Hash Join - Hash Cond: (lineitem.l_orderkey = orders.o_orderkey) - -> Seq Scan on lineitem_290001 lineitem - Filter: (l_quantity < 5.0) - -> Hash - -> Seq Scan on orders_290008 orders + -> Merge Join + Merge Cond: (orders.o_orderkey = lineitem.l_orderkey) + -> Index Scan using orders_pkey_290008 on orders_290008 orders + -> Sort + Sort Key: lineitem.l_orderkey + -> Seq Scan on lineitem_290001 lineitem + Filter: (l_quantity < 5.0) -- Test insert EXPLAIN (COSTS FALSE) INSERT INTO lineitem VALUES(1,0); @@ -293,11 +297,9 @@ Custom Scan (Citus Router) -> Task Node: host=localhost port=57638 dbname=regression -> Update on lineitem_290000 - -> Bitmap Heap Scan on lineitem_290000 - Recheck Cond: (l_orderkey = 1) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 + Index Cond: (l_orderkey = 1) Filter: (l_partkey = 0) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 1) -- Test delete EXPLAIN (COSTS FALSE) DELETE FROM lineitem @@ -308,11 +310,9 @@ Custom Scan (Citus Router) -> Task Node: host=localhost port=57638 dbname=regression -> Delete on lineitem_290000 - -> Bitmap Heap Scan on lineitem_290000 - Recheck Cond: (l_orderkey = 1) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 + Index Cond: (l_orderkey = 1) Filter: (l_partkey = 0) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 1) -- Test single-shard SELECT EXPLAIN (COSTS FALSE) SELECT l_quantity FROM lineitem WHERE l_orderkey = 5; @@ -321,10 +321,8 @@ Custom Scan (Citus Router) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem + Index Cond: (l_orderkey = 5) SELECT true AS valid FROM explain_xml($$ SELECT l_quantity FROM lineitem WHERE l_orderkey = 5$$); t @@ -617,10 +615,8 @@ Custom Scan (Citus Router) (cost=0.00..0.00 rows=0 width=0) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem (cost=4.30..13.44 rows=3 width=18) - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 (cost=0.00..4.30 rows=3 width=0) - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem (cost=0.28..11.83 rows=3 width=5) + Index Cond: (l_orderkey = 5) PREPARE real_time_executor_query AS SELECT avg(l_linenumber) FROM lineitem WHERE l_orderkey > 9030; EXPLAIN (COSTS FALSE) EXECUTE real_time_executor_query; @@ -642,7 +638,5 @@ Custom Scan (Citus Router) (cost=0.00..0.00 rows=0 width=0) Tasks Shown: All -> Task Node: host=localhost port=57637 dbname=regression - -> Bitmap Heap Scan on lineitem_290000 lineitem (cost=4.30..13.44 rows=3 width=18) - Recheck Cond: (l_orderkey = 5) - -> Bitmap Index Scan on lineitem_pkey_290000 (cost=0.00..4.30 rows=3 width=0) - Index Cond: (l_orderkey = 5) + -> Index Scan using lineitem_pkey_290000 on lineitem_290000 lineitem (cost=0.28..11.83 rows=3 width=5) + Index Cond: (l_orderkey = 5) diff --git a/src/test/regress/input/multi_load_data.source b/src/test/regress/input/multi_load_data.source index a4f6d064c..a48c51e36 100644 --- a/src/test/regress/input/multi_load_data.source +++ b/src/test/regress/input/multi_load_data.source @@ -23,5 +23,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; \copy lineitem_hash_part FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|' \copy orders_hash_part FROM '@abs_srcdir@/data/orders.1.data' with delimiter '|' \copy orders_hash_part FROM '@abs_srcdir@/data/orders.2.data' with delimiter '|' - -VACUUM ANALYZE; diff --git a/src/test/regress/input/multi_load_more_data.source b/src/test/regress/input/multi_load_more_data.source index 10070b089..1b7f1f117 100644 --- a/src/test/regress/input/multi_load_more_data.source +++ b/src/test/regress/input/multi_load_more_data.source @@ -13,5 +13,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; \copy customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|' \copy customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|' \copy part FROM '@abs_srcdir@/data/part.more.data' with delimiter '|' - -VACUUM ANALYZE; diff --git a/src/test/regress/input/multi_outer_join_reference.source b/src/test/regress/input/multi_outer_join_reference.source index 08261ee34..f1e5946c4 100644 --- a/src/test/regress/input/multi_outer_join_reference.source +++ b/src/test/regress/input/multi_outer_join_reference.source @@ -447,7 +447,8 @@ SELECT t_custkey, r_custkey FROM multi_outer_join_right_reference FULL JOIN - multi_outer_join_third_reference ON (t_custkey = r_custkey); + multi_outer_join_third_reference ON (t_custkey = r_custkey) +ORDER BY 1; -- DROP unused tables to clean up workspace DROP TABLE multi_outer_join_left_hash; diff --git a/src/test/regress/output/multi_load_data.source b/src/test/regress/output/multi_load_data.source index b78dc2fd8..a54306e69 100644 --- a/src/test/regress/output/multi_load_data.source +++ b/src/test/regress/output/multi_load_data.source @@ -19,6 +19,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; \copy lineitem_hash_part FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|' \copy orders_hash_part FROM '@abs_srcdir@/data/orders.1.data' with delimiter '|' \copy orders_hash_part FROM '@abs_srcdir@/data/orders.2.data' with delimiter '|' -VACUUM ANALYZE; -WARNING: not propagating VACUUM command to worker nodes -HINT: Provide a specific table in order to VACUUM distributed tables. diff --git a/src/test/regress/output/multi_load_more_data.source b/src/test/regress/output/multi_load_more_data.source index bef2e29f9..b41f68dc8 100644 --- a/src/test/regress/output/multi_load_more_data.source +++ b/src/test/regress/output/multi_load_more_data.source @@ -8,6 +8,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; \copy customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|' \copy customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|' \copy part FROM '@abs_srcdir@/data/part.more.data' with delimiter '|' -VACUUM ANALYZE; -WARNING: not propagating VACUUM command to worker nodes -HINT: Provide a specific table in order to VACUUM distributed tables. diff --git a/src/test/regress/output/multi_outer_join_reference.source b/src/test/regress/output/multi_outer_join_reference.source index ecaf1ae01..82d1b88ed 100644 --- a/src/test/regress/output/multi_outer_join_reference.source +++ b/src/test/regress/output/multi_outer_join_reference.source @@ -798,9 +798,20 @@ SELECT t_custkey, r_custkey FROM multi_outer_join_right_reference FULL JOIN - multi_outer_join_third_reference ON (t_custkey = r_custkey); + multi_outer_join_third_reference ON (t_custkey = r_custkey) +ORDER BY 1; t_custkey | r_custkey -----------+----------- + 1 | + 2 | + 3 | + 4 | + 5 | + 6 | + 7 | + 8 | + 9 | + 10 | 11 | 11 12 | 12 13 | 13 @@ -821,16 +832,6 @@ FROM 28 | 28 29 | 29 30 | 30 - 10 | - 2 | - 5 | - 8 | - 6 | - 4 | - 1 | - 3 | - 9 | - 7 | (30 rows) -- DROP unused tables to clean up workspace diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index 068dc45db..1d6e94db2 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -36,6 +36,10 @@ BEGIN END; $BODY$ LANGUAGE plpgsql; +-- VACUMM related tables to ensure test outputs are stable +VACUUM ANALYZE lineitem; +VACUUM ANALYZE orders; + -- Test Text format EXPLAIN (COSTS FALSE, FORMAT TEXT) SELECT l_quantity, count(*) count_quantity FROM lineitem