aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rowley <drowley@postgresql.org>2023-01-24 13:49:39 +1300
committerDavid Rowley <drowley@postgresql.org>2023-01-24 13:49:39 +1300
commit5dc582da6b9a281321e687ae2b52f96b929d8d0e (patch)
treec7200e03590230453cc9372b99c6698a5c440469
parent73f77ab508d1514ca604c47b6f56c5dee4dd9025 (diff)
downloadpostgresql-5dc582da6b9a281321e687ae2b52f96b929d8d0e.tar.gz
postgresql-5dc582da6b9a281321e687ae2b52f96b929d8d0e.zip
Use OFFSET 0 instead of ORDER BY to stop subquery pullup
b762fed64 recently changed this test to prevent subquery pullup to allow us to test Memoize with lateral_vars. As pointed out by Tom Lane, OFFSET 0 is our standard way of preventing subquery pullups, so do it that way instead. Discussion: https://postgr.es/m/2144818.1674517061@sss.pgh.pa.us Backpatch-through: 14, same as b762fed64
-rw-r--r--src/test/regress/expected/memoize.out4
-rw-r--r--src/test/regress/sql/memoize.sql4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/regress/expected/memoize.out b/src/test/regress/expected/memoize.out
index 08719320376..60cbdeec7a8 100644
--- a/src/test/regress/expected/memoize.out
+++ b/src/test/regress/expected/memoize.out
@@ -64,7 +64,7 @@ WHERE t2.unique1 < 1000;
SELECT explain_memoize('
SELECT COUNT(*),AVG(t2.unique1) FROM tenk1 t1,
LATERAL (SELECT t2.unique1 FROM tenk1 t2
- WHERE t1.twenty = t2.unique1 ORDER BY 1) t2
+ WHERE t1.twenty = t2.unique1 OFFSET 0) t2
WHERE t1.unique1 < 1000;', false);
explain_memoize
-------------------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ WHERE t1.unique1 < 1000;', false);
-- And check we get the expected results.
SELECT COUNT(*),AVG(t2.unique1) FROM tenk1 t1,
LATERAL (SELECT t2.unique1 FROM tenk1 t2
- WHERE t1.twenty = t2.unique1 ORDER BY 1) t2
+ WHERE t1.twenty = t2.unique1 OFFSET 0) t2
WHERE t1.unique1 < 1000;
count | avg
-------+--------------------
diff --git a/src/test/regress/sql/memoize.sql b/src/test/regress/sql/memoize.sql
index 623a9d5114f..d66acaed85a 100644
--- a/src/test/regress/sql/memoize.sql
+++ b/src/test/regress/sql/memoize.sql
@@ -48,13 +48,13 @@ WHERE t2.unique1 < 1000;
SELECT explain_memoize('
SELECT COUNT(*),AVG(t2.unique1) FROM tenk1 t1,
LATERAL (SELECT t2.unique1 FROM tenk1 t2
- WHERE t1.twenty = t2.unique1 ORDER BY 1) t2
+ WHERE t1.twenty = t2.unique1 OFFSET 0) t2
WHERE t1.unique1 < 1000;', false);
-- And check we get the expected results.
SELECT COUNT(*),AVG(t2.unique1) FROM tenk1 t1,
LATERAL (SELECT t2.unique1 FROM tenk1 t2
- WHERE t1.twenty = t2.unique1 ORDER BY 1) t2
+ WHERE t1.twenty = t2.unique1 OFFSET 0) t2
WHERE t1.unique1 < 1000;
-- Reduce work_mem and hash_mem_multiplier so that we see some cache evictions