From 2c76b4bc468cb8ba3f85a53ade1671f0bb09ed06 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Thu, 2 May 2019 20:05:25 +0300 Subject: [PATCH 1/2] Add order by to multi_function_in_join test --- src/test/regress/expected/multi_function_in_join.out | 4 ++-- src/test/regress/sql/multi_function_in_join.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/regress/expected/multi_function_in_join.out b/src/test/regress/expected/multi_function_in_join.out index d06016cae..c511a30bb 100644 --- a/src/test/regress/expected/multi_function_in_join.out +++ b/src/test/regress/expected/multi_function_in_join.out @@ -171,9 +171,9 @@ begin return result; end; $$ language plpgsql; -SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data); +SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data) ORDER BY 1,2,3,4; DEBUG: generating subplan 14_1 for subquery SELECT minimum, maximum FROM functions_in_joins.max_and_min() m(minimum, maximum) -DEBUG: Plan 14 query after replacing subqueries and CTEs: SELECT table1.id, table1.data, m.minimum, m.maximum FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.minimum, intermediate_result.maximum FROM read_intermediate_result('14_1'::text, 'binary'::citus_copy_format) intermediate_result(minimum integer, maximum integer)) m ON (((m.maximum OPERATOR(pg_catalog.=) table1.data) OR (m.minimum OPERATOR(pg_catalog.=) table1.data)))) +DEBUG: Plan 14 query after replacing subqueries and CTEs: SELECT table1.id, table1.data, m.minimum, m.maximum FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.minimum, intermediate_result.maximum FROM read_intermediate_result('14_1'::text, 'binary'::citus_copy_format) intermediate_result(minimum integer, maximum integer)) m ON (((m.maximum OPERATOR(pg_catalog.=) table1.data) OR (m.minimum OPERATOR(pg_catalog.=) table1.data)))) ORDER BY table1.id, table1.data, m.minimum, m.maximum id | data | minimum | maximum -----+-------+---------+--------- 1 | 1 | 1 | 10000 diff --git a/src/test/regress/sql/multi_function_in_join.sql b/src/test/regress/sql/multi_function_in_join.sql index 61d9700e0..fdd7549a8 100644 --- a/src/test/regress/sql/multi_function_in_join.sql +++ b/src/test/regress/sql/multi_function_in_join.sql @@ -108,7 +108,7 @@ begin end; $$ language plpgsql; -SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data); +SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data) ORDER BY 1,2,3,4; -- The following tests will fail as we do not support all joins on -- all kinds of functions From 5d68a13139f2547690dfe51487d6a0471975828f Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Thu, 2 May 2019 20:09:33 +0300 Subject: [PATCH 2/2] Add order by to multi_shard_update_delete --- src/test/regress/expected/multi_shard_update_delete.out | 6 +++--- src/test/regress/sql/multi_shard_update_delete.sql | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/multi_shard_update_delete.out b/src/test/regress/expected/multi_shard_update_delete.out index 0f2040ed1..56d72ba95 100644 --- a/src/test/regress/expected/multi_shard_update_delete.out +++ b/src/test/regress/expected/multi_shard_update_delete.out @@ -773,16 +773,16 @@ SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; (3 rows) UPDATE test_table_1 SET col_3 = 3 WHERE date_col < now(); -SELECT * FROM test_table_1; +SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; id | date_col | col_3 ----+------------------------------+------- - 1 | Sat Apr 05 08:32:12 2014 PDT | 3 3 | Mon Jan 12 08:35:19 2111 PST | 9 2 | Sun Feb 01 08:31:16 2015 PST | 3 + 1 | Sat Apr 05 08:32:12 2014 PDT | 3 (3 rows) DELETE FROM test_table_1 WHERE date_col < current_timestamp; -SELECT * FROM test_table_1; +SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; id | date_col | col_3 ----+------------------------------+------- 3 | Mon Jan 12 08:35:19 2111 PST | 9 diff --git a/src/test/regress/sql/multi_shard_update_delete.sql b/src/test/regress/sql/multi_shard_update_delete.sql index 6cf0a7ce5..87c580854 100644 --- a/src/test/regress/sql/multi_shard_update_delete.sql +++ b/src/test/regress/sql/multi_shard_update_delete.sql @@ -644,9 +644,9 @@ ROLLBACK; -- Stable functions are supported SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; UPDATE test_table_1 SET col_3 = 3 WHERE date_col < now(); -SELECT * FROM test_table_1; +SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; DELETE FROM test_table_1 WHERE date_col < current_timestamp; -SELECT * FROM test_table_1; +SELECT * FROM test_table_1 ORDER BY 1 DESC, 2 DESC, 3 DESC; DROP TABLE test_table_1;