Skip to content

Commit b5e0a2a

Browse files
tglsfdctglsfdc
committed
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.
1 parent 60dd40b commit b5e0a2a

File tree

12 files changed

+50
-12
lines changed

12 files changed

+50
-12
lines changed

‎src/test/regress/expected/aggregates.out

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ FROM bool_test;
506506
-- Test cases that should be optimized into indexscans instead of
507507
-- the generic aggregate implementation.
508508
--
509-
analyze tenk1; -- ensure we get consistent plans here
510509
-- Basic cases
511510
explain (costs off)
512511
select min(unique1) from tenk1;

‎src/test/regress/expected/alter_table.out

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1;
140140
CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1;
141141
ALTER TABLE tmp_view RENAME TO tmp_view_new;
142142
-- hack to ensure we get an indexscan here
143-
ANALYZE tenk1;
144143
set enable_seqscan to off;
145144
set enable_bitmapscan to off;
146145
-- 5 values, sorted

‎src/test/regress/expected/arrays.out

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ SELECT 0 || ARRAY[1,2] || 3 AS "{0,1,2,3}";
421421
{0,1,2,3}
422422
(1 row)
423423

424-
ANALYZE array_op_test;
425424
SELECT * FROM array_op_test WHERE i @> '{32}' ORDER BY seqno;
426425
seqno | i | t
427426
-------+---------------------------------+------------------------------------------------------------------------------------------------------------------------------------

‎src/test/regress/expected/create_index.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2715,7 +2715,7 @@ SELECT count(*) FROM dupindexcols
27152715
--
27162716
-- Check ordering of =ANY indexqual results (bug in 9.2.0)
27172717
--
2718-
vacuum analyze tenk1; -- ensure we get consistent plans here
2718+
vacuum tenk1; -- ensure we get consistent plans here
27192719
explain (costs off)
27202720
SELECT unique1 FROM tenk1
27212721
WHERE unique1 IN (1,42,7)

‎src/test/regress/expected/join.out

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,6 @@ on (x1 = xx1) where (xx2 is not null);
21292129
-- regression test: check for bug with propagation of implied equality
21302130
-- to outside an IN
21312131
--
2132-
analyze tenk1; -- ensure we get consistent plans here
21332132
select count(*) from tenk1 a where unique1 in
21342133
(select unique1 from tenk1 b join tenk1 c using (unique1)
21352134
where b.unique2 = 42);

‎src/test/regress/input/copy.source

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,31 @@ COPY array_op_test FROM '@abs_srcdir@/data/array.data';
6060

6161
COPY array_index_op_test FROM '@abs_srcdir@/data/array.data';
6262

63+
-- analyze all the data we just loaded, to ensure plan consistency
64+
-- in later tests
65+
66+
ANALYZE aggtest;
67+
ANALYZE onek;
68+
ANALYZE tenk1;
69+
ANALYZE slow_emp4000;
70+
ANALYZE person;
71+
ANALYZE emp;
72+
ANALYZE student;
73+
ANALYZE stud_emp;
74+
ANALYZE road;
75+
ANALYZE real_city;
76+
ANALYZE hash_i4_heap;
77+
ANALYZE hash_name_heap;
78+
ANALYZE hash_txt_heap;
79+
ANALYZE hash_f8_heap;
80+
ANALYZE test_tsvector;
81+
ANALYZE bt_i4_heap;
82+
ANALYZE bt_name_heap;
83+
ANALYZE bt_txt_heap;
84+
ANALYZE bt_f8_heap;
85+
ANALYZE array_op_test;
86+
ANALYZE array_index_op_test;
87+
6388
--- test copying in CSV mode with various styles
6489
--- of embedded line ending characters
6590

‎src/test/regress/output/copy.source

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,29 @@ COPY bt_txt_heap FROM '@abs_srcdir@/data/desc.data';
3434
COPY bt_f8_heap FROM '@abs_srcdir@/data/hash.data';
3535
COPY array_op_test FROM '@abs_srcdir@/data/array.data';
3636
COPY array_index_op_test FROM '@abs_srcdir@/data/array.data';
37+
-- analyze all the data we just loaded, to ensure plan consistency
38+
-- in later tests
39+
ANALYZE aggtest;
40+
ANALYZE onek;
41+
ANALYZE tenk1;
42+
ANALYZE slow_emp4000;
43+
ANALYZE person;
44+
ANALYZE emp;
45+
ANALYZE student;
46+
ANALYZE stud_emp;
47+
ANALYZE road;
48+
ANALYZE real_city;
49+
ANALYZE hash_i4_heap;
50+
ANALYZE hash_name_heap;
51+
ANALYZE hash_txt_heap;
52+
ANALYZE hash_f8_heap;
53+
ANALYZE test_tsvector;
54+
ANALYZE bt_i4_heap;
55+
ANALYZE bt_name_heap;
56+
ANALYZE bt_txt_heap;
57+
ANALYZE bt_f8_heap;
58+
ANALYZE array_op_test;
59+
ANALYZE array_index_op_test;
3760
--- test copying in CSV mode with various styles
3861
--- of embedded line ending characters
3962
create temp table copytest (

‎src/test/regress/sql/aggregates.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ FROM bool_test;
220220
-- Test cases that should be optimized into indexscans instead of
221221
-- the generic aggregate implementation.
222222
--
223-
analyze tenk1; -- ensure we get consistent plans here
224223

225224
-- Basic cases
226225
explain (costs off)

‎src/test/regress/sql/alter_table.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1;
178178
ALTER TABLE tmp_view RENAME TO tmp_view_new;
179179

180180
-- hack to ensure we get an indexscan here
181-
ANALYZE tenk1;
182181
set enable_seqscan to off;
183182
set enable_bitmapscan to off;
184183
-- 5 values, sorted

‎src/test/regress/sql/arrays.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ SELECT ARRAY[[1,2],[3,4]] || ARRAY[5,6] AS "{{1,2},{3,4},{5,6}}";
196196
SELECT ARRAY[0,0] || ARRAY[1,1] || ARRAY[2,2] AS "{0,0,1,1,2,2}";
197197
SELECT 0 || ARRAY[1,2] || 3 AS "{0,1,2,3}";
198198

199-
ANALYZE array_op_test;
200-
201199
SELECT * FROM array_op_test WHERE i @> '{32}' ORDER BY seqno;
202200
SELECT * FROM array_op_test WHERE i && '{32}' ORDER BY seqno;
203201
SELECT * FROM array_op_test WHERE i @> '{17}' ORDER BY seqno;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy