From 52c342dd0241f18c16975da309585cfbc69e36d3 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 11 Dec 2013 15:08:42 -0500 Subject: [PATCH] Tweak placement of explicit ANALYZE commands in the regression tests. Make the COPY test, which loads most of the large static tables used in the tests, also explicitly ANALYZE those tables. This allows us to get rid of various ad-hoc, and rather redundant, ANALYZE commands that had gotten stuck into various test scripts over time to ensure we got consistent plan choices. (We could have done a database-wide ANALYZE, but that would cause stats to get attached to the small static tables too, which results in plan changes compared to the historical behavior. I'm not sure that's a good idea, so not going that far for now.) Back-patch to 9.0, since 9.0 and 9.1 are currently sometimes failing regression tests for lack of an "ANALYZE tenk1" in the subselect test. There's no need for this in 8.4 since we didn't print any plans back then. --- src/test/regress/expected/aggregates.out | 1 - src/test/regress/expected/alter_table.out | 1 - src/test/regress/expected/join.out | 1 - src/test/regress/input/copy.source | 25 +++++++++++++++++++++++ src/test/regress/output/copy.source | 23 +++++++++++++++++++++ src/test/regress/sql/aggregates.sql | 1 - src/test/regress/sql/alter_table.sql | 1 - src/test/regress/sql/join.sql | 2 -- 8 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index abedc30a7d..84342e7b0b 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -445,7 +445,6 @@ FROM bool_test; -- Test cases that should be optimized into indexscans instead of -- the generic aggregate implementation. -- -analyze tenk1; -- ensure we get consistent plans here -- Basic cases explain (costs off) select min(unique1) from tenk1; diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index 5b79876cca..8215dfdc8a 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -134,7 +134,6 @@ ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1; CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1; ALTER TABLE tmp_view RENAME TO tmp_view_new; -- hack to ensure we get an indexscan here -ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; -- 5 values, sorted diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 4b5909f156..c079f7f125 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -2129,7 +2129,6 @@ on (x1 = xx1) where (xx2 is not null); -- regression test: check for bug with propagation of implied equality -- to outside an IN -- -analyze tenk1; -- ensure we get consistent plans here select count(*) from tenk1 a where unique1 in (select unique1 from tenk1 b join tenk1 c using (unique1) where b.unique2 = 42); diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source index ab3f5083e8..80f911fea8 100644 --- a/src/test/regress/input/copy.source +++ b/src/test/regress/input/copy.source @@ -60,6 +60,31 @@ COPY array_op_test FROM '@abs_srcdir@/data/array.data'; COPY array_index_op_test FROM '@abs_srcdir@/data/array.data'; +-- analyze all the data we just loaded, to ensure plan consistency +-- in later tests + +ANALYZE aggtest; +ANALYZE onek; +ANALYZE tenk1; +ANALYZE slow_emp4000; +ANALYZE person; +ANALYZE emp; +ANALYZE student; +ANALYZE stud_emp; +ANALYZE road; +ANALYZE real_city; +ANALYZE hash_i4_heap; +ANALYZE hash_name_heap; +ANALYZE hash_txt_heap; +ANALYZE hash_f8_heap; +ANALYZE test_tsvector; +ANALYZE bt_i4_heap; +ANALYZE bt_name_heap; +ANALYZE bt_txt_heap; +ANALYZE bt_f8_heap; +ANALYZE array_op_test; +ANALYZE array_index_op_test; + --- test copying in CSV mode with various styles --- of embedded line ending characters diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source index febca712bb..e8951c5b73 100644 --- a/src/test/regress/output/copy.source +++ b/src/test/regress/output/copy.source @@ -34,6 +34,29 @@ COPY bt_txt_heap FROM '@abs_srcdir@/data/desc.data'; COPY bt_f8_heap FROM '@abs_srcdir@/data/hash.data'; COPY array_op_test FROM '@abs_srcdir@/data/array.data'; COPY array_index_op_test FROM '@abs_srcdir@/data/array.data'; +-- analyze all the data we just loaded, to ensure plan consistency +-- in later tests +ANALYZE aggtest; +ANALYZE onek; +ANALYZE tenk1; +ANALYZE slow_emp4000; +ANALYZE person; +ANALYZE emp; +ANALYZE student; +ANALYZE stud_emp; +ANALYZE road; +ANALYZE real_city; +ANALYZE hash_i4_heap; +ANALYZE hash_name_heap; +ANALYZE hash_txt_heap; +ANALYZE hash_f8_heap; +ANALYZE test_tsvector; +ANALYZE bt_i4_heap; +ANALYZE bt_name_heap; +ANALYZE bt_txt_heap; +ANALYZE bt_f8_heap; +ANALYZE array_op_test; +ANALYZE array_index_op_test; --- test copying in CSV mode with various styles --- of embedded line ending characters create temp table copytest ( diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql index 8bc74d2883..631c6dbe80 100644 --- a/src/test/regress/sql/aggregates.sql +++ b/src/test/regress/sql/aggregates.sql @@ -208,7 +208,6 @@ FROM bool_test; -- Test cases that should be optimized into indexscans instead of -- the generic aggregate implementation. -- -analyze tenk1; -- ensure we get consistent plans here -- Basic cases explain (costs off) diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 3f4ea61204..ad47726d71 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -173,7 +173,6 @@ CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1; ALTER TABLE tmp_view RENAME TO tmp_view_new; -- hack to ensure we get an indexscan here -ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; -- 5 values, sorted diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index a4cc67a4cd..5626791269 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -330,8 +330,6 @@ on (x1 = xx1) where (xx2 is not null); -- regression test: check for bug with propagation of implied equality -- to outside an IN -- -analyze tenk1; -- ensure we get consistent plans here - select count(*) from tenk1 a where unique1 in (select unique1 from tenk1 b join tenk1 c using (unique1) where b.unique2 = 42); -- 2.40.0