postgres.git / summary / log / commit / refs
commit d4d48a5edd9eb28a7f2ee2e4cbe20d984274982e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu Jun 05 01:31:41 2014 +0000
First released in: 9.4.0
Tweak new regression test case for better portability.
Buildfarm says we get different plans on 32-bit and 64-bit platforms,
probably because of MAXALIGN-related differences in memory-consumption
calculations. Add some dummy WHERE clauses so that the planner estimates
different sizes for the three generate_series() relations; that should
stabilize the choice of join order.
src/test/regress/expected/pg_lsn.out | 8 ++++++--
src/test/regress/sql/pg_lsn.sql | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/test/regress/expected/pg_lsn.out b/src/test/regress/expected/pg_lsn.out
index 493eb9ea840..2854cfd7b94 100644
--- a/src/test/regress/expected/pg_lsn.out
+++ b/src/test/regress/expected/pg_lsn.out
@@ -70,6 +70,7 @@ SELECT DISTINCT (i || '/' || j)::pg_lsn f
FROM generate_series(1, 10) i,
generate_series(1, 10) j,
generate_series(1, 5) k
+ WHERE i <= 10 AND j > 0 AND j <= 10
ORDER BY f;
QUERY PLAN
--------------------------------------------------------------------------
@@ -81,14 +82,17 @@ SELECT DISTINCT (i || '/' || j)::pg_lsn f
-> Function Scan on generate_series k
-> Materialize
-> Nested Loop
- -> Function Scan on generate_series i
-> Function Scan on generate_series j
-(10 rows)
+ Filter: ((j > 0) AND (j <= 10))
+ -> Function Scan on generate_series i
+ Filter: (i <= 10)
+(12 rows)
SELECT DISTINCT (i || '/' || j)::pg_lsn f
FROM generate_series(1, 10) i,
generate_series(1, 10) j,
generate_series(1, 5) k
+ WHERE i <= 10 AND j > 0 AND j <= 10
ORDER BY f;
f
-------
diff --git a/src/test/regress/sql/pg_lsn.sql b/src/test/regress/sql/pg_lsn.sql
index a3da0f15796..746f720d690 100644
--- a/src/test/regress/sql/pg_lsn.sql
+++ b/src/test/regress/sql/pg_lsn.sql
@@ -30,10 +30,12 @@ SELECT DISTINCT (i || '/' || j)::pg_lsn f
FROM generate_series(1, 10) i,
generate_series(1, 10) j,
generate_series(1, 5) k
+ WHERE i <= 10 AND j > 0 AND j <= 10
ORDER BY f;
SELECT DISTINCT (i || '/' || j)::pg_lsn f
FROM generate_series(1, 10) i,
generate_series(1, 10) j,
generate_series(1, 5) k
+ WHERE i <= 10 AND j > 0 AND j <= 10
ORDER BY f;
[parent: 4c8ab1b91d2b]