aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2015-05-26 14:10:46 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2015-05-26 14:11:12 -0400
commit1f303fd1be51f26553e7c95d8696aa4e28ece1c6 (patch)
tree93f1b3633727db931f79fd9ba224c81dc9540b74 /src
parentfba12c8c6c4159e1923958a4006b26f3cf873254 (diff)
downloadpostgresql-1f303fd1be51f26553e7c95d8696aa4e28ece1c6.tar.gz
postgresql-1f303fd1be51f26553e7c95d8696aa4e28ece1c6.zip
Suppress occasional failures in brin regression test.
brin.sql included a call of brin_summarize_new_values(), and expected it to always report exactly 5 summarization events. This failed sometimes during parallel regression tests, as a consequence of the database-wide VACUUM in gist.sql getting there first. The most future-proof way to avoid variation in the test results is to forget about using brin_summarize_new_values() and just do a plain "VACUUM brintest", which will exercise the same code anyway. Having done that, there's no need for preventing autovacuum on brintest; doing so just reduces the scope of test coverage, so let's not.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/brin.out9
-rw-r--r--src/test/regress/sql/brin.sql4
2 files changed, 4 insertions, 9 deletions
diff --git a/src/test/regress/expected/brin.out b/src/test/regress/expected/brin.out
index 8ba961a662b..2be4b7ca3f6 100644
--- a/src/test/regress/expected/brin.out
+++ b/src/test/regress/expected/brin.out
@@ -26,7 +26,7 @@ CREATE TABLE brintest (byteacol bytea,
int4rangecol int4range,
lsncol pg_lsn,
boxcol box
-) WITH (fillfactor=10, autovacuum_enabled=off);
+) WITH (fillfactor=10);
INSERT INTO brintest SELECT
repeat(stringu1, 8)::bytea,
substr(stringu1, 1, 1)::"char",
@@ -239,11 +239,6 @@ INSERT INTO brintest SELECT
format('%s/%s%s', odd, even, tenthous)::pg_lsn,
box(point(odd, even), point(thousand, twothousand))
FROM tenk1 LIMIT 5 OFFSET 5;
-SELECT brin_summarize_new_values('brinidx'::regclass);
- brin_summarize_new_values
----------------------------
- 5
-(1 row)
-
+VACUUM brintest; -- force a summarization cycle in brinidx
UPDATE brintest SET int8col = int8col * int4col;
UPDATE brintest SET textcol = '' WHERE textcol IS NOT NULL;
diff --git a/src/test/regress/sql/brin.sql b/src/test/regress/sql/brin.sql
index e92717f6ff0..f47ef04c439 100644
--- a/src/test/regress/sql/brin.sql
+++ b/src/test/regress/sql/brin.sql
@@ -26,7 +26,7 @@ CREATE TABLE brintest (byteacol bytea,
int4rangecol int4range,
lsncol pg_lsn,
boxcol box
-) WITH (fillfactor=10, autovacuum_enabled=off);
+) WITH (fillfactor=10);
INSERT INTO brintest SELECT
repeat(stringu1, 8)::bytea,
@@ -247,7 +247,7 @@ INSERT INTO brintest SELECT
box(point(odd, even), point(thousand, twothousand))
FROM tenk1 LIMIT 5 OFFSET 5;
-SELECT brin_summarize_new_values('brinidx'::regclass);
+VACUUM brintest; -- force a summarization cycle in brinidx
UPDATE brintest SET int8col = int8col * int4col;
UPDATE brintest SET textcol = '' WHERE textcol IS NOT NULL;