diff options
| author | Andres Freund <andres@anarazel.de> | 2019-11-13 16:36:31 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2019-11-13 16:36:31 -0800 |
| commit | 80ef34fc7075b37fc23f4ab714a5ce60f82400de (patch) | |
| tree | 2e384637c7f193e7339f73b0c3d759ee2285234c | |
| parent | 7d962eaf50c093b4bb1d35a7b495d416a67b40e2 (diff) | |
| download | postgresql-80ef34fc7075b37fc23f4ab714a5ce60f82400de.tar.gz postgresql-80ef34fc7075b37fc23f4ab714a5ce60f82400de.zip | |
Fix plan instability in the new tuplesort test.
At least buildfarm member florican doesn't use a material node above a
sort in the mark/restore case. As material is not intended to be
tested with that query, disallow.
| -rw-r--r-- | src/test/regress/expected/tuplesort.out | 10 | ||||
| -rw-r--r-- | src/test/regress/sql/tuplesort.sql | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/test/regress/expected/tuplesort.out b/src/test/regress/expected/tuplesort.out index dc30869e193..0a2fef95ce1 100644 --- a/src/test/regress/expected/tuplesort.out +++ b/src/test/regress/expected/tuplesort.out @@ -603,6 +603,7 @@ INSERT INTO test_mark_restore(col1, col2, col12) BEGIN; SET LOCAL enable_nestloop = off; SET LOCAL enable_hashjoin = off; +SET LOCAL enable_material = off; -- set query into variable once, to avoid repetition of the fairly long query SELECT $$ SELECT col12, count(distinct a.col1), count(distinct a.col2), count(distinct b.col1), count(distinct b.col2), count(*) @@ -664,11 +665,10 @@ EXPLAIN (COSTS OFF) :qry; -> Sort Sort Key: a.col12 DESC -> Seq Scan on test_mark_restore a - -> Materialize - -> Sort - Sort Key: b.col12 DESC - -> Seq Scan on test_mark_restore b -(15 rows) + -> Sort + Sort Key: b.col12 DESC + -> Seq Scan on test_mark_restore b +(14 rows) :qry; col12 | count | count | count | count | count diff --git a/src/test/regress/sql/tuplesort.sql b/src/test/regress/sql/tuplesort.sql index 0181e9d99a8..6b91014a6b8 100644 --- a/src/test/regress/sql/tuplesort.sql +++ b/src/test/regress/sql/tuplesort.sql @@ -275,6 +275,7 @@ BEGIN; SET LOCAL enable_nestloop = off; SET LOCAL enable_hashjoin = off; +SET LOCAL enable_material = off; -- set query into variable once, to avoid repetition of the fairly long query SELECT $$ |