From 04d9e886fe5cde162f17cd22fa8071c2a35c4f73 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Thu, 10 May 2018 09:57:46 +0300 Subject: [PATCH] Run concurrent modification queries in tests sequentially --- src/test/regress/expected/with_nested.out | 4 ++-- src/test/regress/expected/with_set_operations.out | 2 +- src/test/regress/multi_schedule | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/with_nested.out b/src/test/regress/expected/with_nested.out index cc158b62f..96953b525 100644 --- a/src/test/regress/expected/with_nested.out +++ b/src/test/regress/expected/with_nested.out @@ -238,6 +238,7 @@ LIMIT 1 | Thu Nov 23 11:44:57.515981 2017 | 4 | 3 | 4 | 1 | Thu Nov 23 17:23:03.441394 2017 | 5 | 4 | 3 | 1 | Thu Nov 23 17:30:34.635085 2017 | 3 | 4 | 4 | + 1 | | | | | 2 | Wed Nov 22 18:19:49.944985 2017 | 3 | 5 | 1 | 2 | Thu Nov 23 00:19:14.138058 2017 | 3 | 4 | 0 | 2 | Thu Nov 23 01:04:26.198826 2017 | 4 | 3 | 4 | @@ -250,7 +251,6 @@ LIMIT 2 | Thu Nov 23 08:22:22.169158 2017 | 4 | 2 | 5 | 2 | Thu Nov 23 08:49:47.029236 2017 | 4 | 2 | 4 | 2 | Thu Nov 23 09:54:28.13665 2017 | 0 | 3 | 4 | - 2 | Thu Nov 23 09:59:08.975079 2017 | 2 | 2 | 4 | (20 rows) -- Nested CTEs - joined with local table. Not supported yet. @@ -328,6 +328,7 @@ LIMIT 1 | Thu Nov 23 11:44:57.515981 2017 | 4 | 3 | 4 | 1 | Thu Nov 23 17:23:03.441394 2017 | 5 | 4 | 3 | 1 | Thu Nov 23 17:30:34.635085 2017 | 3 | 4 | 4 | + 1 | | | | | 2 | Wed Nov 22 18:19:49.944985 2017 | 3 | 5 | 1 | 2 | Thu Nov 23 00:19:14.138058 2017 | 3 | 4 | 0 | 2 | Thu Nov 23 01:04:26.198826 2017 | 4 | 3 | 4 | @@ -340,7 +341,6 @@ LIMIT 2 | Thu Nov 23 08:22:22.169158 2017 | 4 | 2 | 5 | 2 | Thu Nov 23 08:49:47.029236 2017 | 4 | 2 | 4 | 2 | Thu Nov 23 09:54:28.13665 2017 | 0 | 3 | 4 | - 2 | Thu Nov 23 09:59:08.975079 2017 | 2 | 2 | 4 | (20 rows) -- access to uncle, use window function, apply aggregates, use group by, LIMIT/OFFSET diff --git a/src/test/regress/expected/with_set_operations.out b/src/test/regress/expected/with_set_operations.out index cd334873e..bb82c67c3 100644 --- a/src/test/regress/expected/with_set_operations.out +++ b/src/test/regress/expected/with_set_operations.out @@ -298,11 +298,11 @@ DEBUG: generating subplan 61_2 for CTE cte_1: SELECT user_id, value_2 FROM publ DEBUG: Plan 61 query after replacing subqueries and CTEs: SELECT cte_1.x, cte_1.value_2 FROM (SELECT intermediate_result.user_id AS x, intermediate_result.value_2 FROM read_intermediate_result('61_1'::text, 'binary'::citus_copy_format) intermediate_result(user_id integer, value_2 integer)) cte_1 UNION SELECT cte_1.x, cte_1.value_2 FROM (SELECT intermediate_result.user_id AS x, intermediate_result.value_2 FROM read_intermediate_result('61_2'::text, 'binary'::citus_copy_format) intermediate_result(user_id integer, value_2 integer)) cte_1 ORDER BY 1 DESC, 2 DESC LIMIT 5 x | value_2 ---+--------- + 6 | 6 | 4 6 | 3 6 | 2 6 | 1 - 6 | 0 (5 rows) -- simple subqueries in WHERE with unions diff --git a/src/test/regress/multi_schedule b/src/test/regress/multi_schedule index aa4fa3a6c..224dd6863 100644 --- a/src/test/regress/multi_schedule +++ b/src/test/regress/multi_schedule @@ -94,14 +94,19 @@ test: multi_join_order_tpch_repartition # ---------- test: multi_repartition_join_planning multi_repartition_join_pruning multi_repartition_join_task_assignment +# --------- +# Tests that modify data should run sequentially +# --------- +test: with_prepare + # --------- # Tests for recursive planning. # --------- - -test: with_nested with_where with_basics with_prepare with_set_operations +test: with_nested with_where with_basics with_set_operations test: with_modifying cte_prepared_modify cte_nested_modification test: with_executors with_join with_partitioning with_transactions with_dml + # ---------- # Tests to check our large record loading and shard deletion behavior # ----------