From 641ef9bd6faf4a51a17a8e1e8efe4b71853d4529 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Tue, 19 Oct 2021 15:29:01 +0200 Subject: [PATCH] Fix flappy subquery_append test --- src/test/regress/expected/subquery_append.out | 28 +++++++++++-------- src/test/regress/sql/subquery_append.sql | 8 +++--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/test/regress/expected/subquery_append.out b/src/test/regress/expected/subquery_append.out index c023bc92c..1316bb2e6 100644 --- a/src/test/regress/expected/subquery_append.out +++ b/src/test/regress/expected/subquery_append.out @@ -70,25 +70,31 @@ SELECT v, max(key) FROM (SELECT key, value + 1 AS v FROM append_table) sub GROUP 124 | hij (3 rows) -SELECT key, row_number() OVER (ORDER BY value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (ORDER BY key, value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; key | row_number --------------------------------------------------------------------- - abc | 6 - abc | 9 - bcd | 4 + abc | 1 + abc | 2 + bcd | 3 (3 rows) -SELECT key, row_number() OVER (ORDER BY value PARTITION BY key) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; -ERROR: syntax error at or near "PARTITION" -SELECT key, row_number() OVER (ORDER BY value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (PARTITION BY key ORDER BY key,value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; key | row_number --------------------------------------------------------------------- - abc | 6 - abc | 9 - bcd | 4 + abc | 1 + abc | 2 + bcd | 1 (3 rows) -SELECT key, row_number() OVER (PARTITION BY key) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (ORDER BY key, value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; + key | row_number +--------------------------------------------------------------------- + abc | 1 + abc | 2 + bcd | 3 +(3 rows) + +SELECT key, row_number() OVER (PARTITION BY key ORDER BY key,value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; key | row_number --------------------------------------------------------------------- abc | 1 diff --git a/src/test/regress/sql/subquery_append.sql b/src/test/regress/sql/subquery_append.sql index 02f02e9f4..940556f7e 100644 --- a/src/test/regress/sql/subquery_append.sql +++ b/src/test/regress/sql/subquery_append.sql @@ -45,11 +45,11 @@ SELECT DISTINCT key FROM (SELECT key FROM append_table) sub ORDER BY 1 LIMIT 3; SELECT key, max(v) FROM (SELECT key, value + 1 AS v FROM append_table) sub GROUP BY key ORDER BY 1,2 LIMIT 3; SELECT v, max(key) FROM (SELECT key, value + 1 AS v FROM append_table) sub GROUP BY v ORDER BY 1,2 LIMIT 3; -SELECT key, row_number() OVER (ORDER BY value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; -SELECT key, row_number() OVER (ORDER BY value PARTITION BY key) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (ORDER BY key, value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (PARTITION BY key ORDER BY key,value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; -SELECT key, row_number() OVER (ORDER BY value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; -SELECT key, row_number() OVER (PARTITION BY key) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (ORDER BY key, value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; +SELECT key, row_number() OVER (PARTITION BY key ORDER BY key,value) FROM (SELECT key, value, random() FROM append_table) sub ORDER BY 1,2 LIMIT 3; -- try some joins in subqueries SELECT key, count(*) FROM (SELECT *, random() FROM append_table a JOIN append_table b USING (key)) u GROUP BY key ORDER BY 1,2 LIMIT 3;