From 03ecc0a681e69fe8c88f48498bcaffc4ce44de6f Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Tue, 19 May 2020 16:43:07 +0300 Subject: [PATCH] remove task tracker tests from multi mx schedule --- .../expected/multi_mx_repartition_join_w1.out | 15 --------- .../expected/multi_mx_repartition_join_w2.out | 15 --------- .../expected/multi_mx_repartition_udt_w1.out | 33 ------------------- .../expected/multi_mx_repartition_udt_w2.out | 33 ------------------- src/test/regress/multi_mx_schedule | 1 - .../sql/multi_mx_repartition_join_w1.sql | 16 --------- .../sql/multi_mx_repartition_join_w2.sql | 16 --------- .../sql/multi_mx_repartition_udt_w1.sql | 21 ------------ .../sql/multi_mx_repartition_udt_w2.sql | 21 ------------ 9 files changed, 171 deletions(-) delete mode 100644 src/test/regress/expected/multi_mx_repartition_join_w1.out delete mode 100644 src/test/regress/expected/multi_mx_repartition_join_w2.out delete mode 100644 src/test/regress/expected/multi_mx_repartition_udt_w1.out delete mode 100644 src/test/regress/expected/multi_mx_repartition_udt_w2.out delete mode 100644 src/test/regress/sql/multi_mx_repartition_join_w1.sql delete mode 100644 src/test/regress/sql/multi_mx_repartition_join_w2.sql delete mode 100644 src/test/regress/sql/multi_mx_repartition_udt_w1.sql delete mode 100644 src/test/regress/sql/multi_mx_repartition_udt_w2.sql diff --git a/src/test/regress/expected/multi_mx_repartition_join_w1.out b/src/test/regress/expected/multi_mx_repartition_join_w1.out deleted file mode 100644 index eb5fa9afb..000000000 --- a/src/test/regress/expected/multi_mx_repartition_join_w1.out +++ /dev/null @@ -1,15 +0,0 @@ --- Test two concurrent reparttition joins from two different workers --- This test runs the below query from the :worker_1_port and the --- concurrent test runs the same query on :worker_2_port. Note that, both --- tests use the same sequence ids but the queries should not fail. -\c - - - :worker_1_port -SET citus.task_executor_type TO "task-tracker"; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -CREATE TEMP TABLE t1 AS -SELECT - l1.l_comment -FROM - lineitem_mx l1, orders_mx l2 -WHERE - l1.l_comment = l2.o_comment; diff --git a/src/test/regress/expected/multi_mx_repartition_join_w2.out b/src/test/regress/expected/multi_mx_repartition_join_w2.out deleted file mode 100644 index fe3d46533..000000000 --- a/src/test/regress/expected/multi_mx_repartition_join_w2.out +++ /dev/null @@ -1,15 +0,0 @@ --- Test two concurrent reparttition joins from two different workers --- This test runs the below query from the :worker_2_port and the --- concurrent test runs the same query on :worker_1_port. Note that, both --- tests use the same sequence ids but the queries should not fail. -\c - - - :worker_2_port -SET citus.task_executor_type TO "task-tracker"; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -CREATE TEMP TABLE t1 AS -SELECT - l1.l_comment -FROM - lineitem_mx l1, orders_mx l2 -WHERE - l1.l_comment = l2.o_comment; diff --git a/src/test/regress/expected/multi_mx_repartition_udt_w1.out b/src/test/regress/expected/multi_mx_repartition_udt_w1.out deleted file mode 100644 index 8fd2ae4fb..000000000 --- a/src/test/regress/expected/multi_mx_repartition_udt_w1.out +++ /dev/null @@ -1,33 +0,0 @@ --- --- MULTI_MX_REPARTITION_W1_UDT --- -\c - - - :worker_1_port -SET client_min_messages = LOG; --- Query that should result in a repartition join on UDT column. -SET citus.task_executor_type = 'task-tracker'; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -SET citus.log_multi_join_order = true; --- Query that should result in a repartition --- join on int column, and be empty -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.pk = repartition_udt_other.pk; -LOG: join order: [ "repartition_udt" ][ dual partition join "repartition_udt_other" ] - pk | udtcol | txtcol | pk | udtcol | txtcol ---------------------------------------------------------------------- -(0 rows) - -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.udtcol = repartition_udt_other.udtcol - WHERE repartition_udt.pk > 1 - ORDER BY repartition_udt.pk; -LOG: join order: [ "repartition_udt" ][ dual partition join "repartition_udt_other" ] - pk | udtcol | txtcol | pk | udtcol | txtcol ---------------------------------------------------------------------- - 2 | (1,2) | foo | 8 | (1,2) | foo - 3 | (1,3) | foo | 9 | (1,3) | foo - 4 | (2,1) | foo | 10 | (2,1) | foo - 5 | (2,2) | foo | 11 | (2,2) | foo - 6 | (2,3) | foo | 12 | (2,3) | foo -(5 rows) - diff --git a/src/test/regress/expected/multi_mx_repartition_udt_w2.out b/src/test/regress/expected/multi_mx_repartition_udt_w2.out deleted file mode 100644 index d48cb410a..000000000 --- a/src/test/regress/expected/multi_mx_repartition_udt_w2.out +++ /dev/null @@ -1,33 +0,0 @@ --- --- MULTI_MX_REPARTITION_W2_UDT --- -\c - - - :worker_2_port -SET client_min_messages = LOG; --- Query that should result in a repartition join on UDT column. -SET citus.task_executor_type = 'task-tracker'; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -SET citus.log_multi_join_order = true; --- Query that should result in a repartition --- join on int column, and be empty. -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.pk = repartition_udt_other.pk; -LOG: join order: [ "repartition_udt" ][ dual partition join "repartition_udt_other" ] - pk | udtcol | txtcol | pk | udtcol | txtcol ---------------------------------------------------------------------- -(0 rows) - -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.udtcol = repartition_udt_other.udtcol - WHERE repartition_udt.pk > 1 - ORDER BY repartition_udt.pk; -LOG: join order: [ "repartition_udt" ][ dual partition join "repartition_udt_other" ] - pk | udtcol | txtcol | pk | udtcol | txtcol ---------------------------------------------------------------------- - 2 | (1,2) | foo | 8 | (1,2) | foo - 3 | (1,3) | foo | 9 | (1,3) | foo - 4 | (2,1) | foo | 10 | (2,1) | foo - 5 | (2,2) | foo | 11 | (2,2) | foo - 6 | (2,3) | foo | 12 | (2,3) | foo -(5 rows) - diff --git a/src/test/regress/multi_mx_schedule b/src/test/regress/multi_mx_schedule index 8c6f81536..56d420a7d 100644 --- a/src/test/regress/multi_mx_schedule +++ b/src/test/regress/multi_mx_schedule @@ -34,7 +34,6 @@ test: multi_mx_tpch_query7_nested multi_mx_ddl test: ch_bench_having_mx test: recursive_dml_queries_mx multi_mx_truncate_from_worker test: multi_mx_repartition_udt_prepare mx_foreign_key_to_reference_table -test: multi_mx_repartition_join_w1 multi_mx_repartition_join_w2 multi_mx_repartition_udt_w1 multi_mx_repartition_udt_w2 test: multi_mx_metadata test: master_evaluation master_evaluation_modify master_evaluation_select test: multi_mx_call diff --git a/src/test/regress/sql/multi_mx_repartition_join_w1.sql b/src/test/regress/sql/multi_mx_repartition_join_w1.sql deleted file mode 100644 index c76de0516..000000000 --- a/src/test/regress/sql/multi_mx_repartition_join_w1.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Test two concurrent reparttition joins from two different workers --- This test runs the below query from the :worker_1_port and the --- concurrent test runs the same query on :worker_2_port. Note that, both --- tests use the same sequence ids but the queries should not fail. -\c - - - :worker_1_port - -SET citus.task_executor_type TO "task-tracker"; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -CREATE TEMP TABLE t1 AS -SELECT - l1.l_comment -FROM - lineitem_mx l1, orders_mx l2 -WHERE - l1.l_comment = l2.o_comment; diff --git a/src/test/regress/sql/multi_mx_repartition_join_w2.sql b/src/test/regress/sql/multi_mx_repartition_join_w2.sql deleted file mode 100644 index 538d8728f..000000000 --- a/src/test/regress/sql/multi_mx_repartition_join_w2.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Test two concurrent reparttition joins from two different workers --- This test runs the below query from the :worker_2_port and the --- concurrent test runs the same query on :worker_1_port. Note that, both --- tests use the same sequence ids but the queries should not fail. -\c - - - :worker_2_port - -SET citus.task_executor_type TO "task-tracker"; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -CREATE TEMP TABLE t1 AS -SELECT - l1.l_comment -FROM - lineitem_mx l1, orders_mx l2 -WHERE - l1.l_comment = l2.o_comment; diff --git a/src/test/regress/sql/multi_mx_repartition_udt_w1.sql b/src/test/regress/sql/multi_mx_repartition_udt_w1.sql deleted file mode 100644 index ff4aba820..000000000 --- a/src/test/regress/sql/multi_mx_repartition_udt_w1.sql +++ /dev/null @@ -1,21 +0,0 @@ --- --- MULTI_MX_REPARTITION_W1_UDT --- - -\c - - - :worker_1_port -SET client_min_messages = LOG; --- Query that should result in a repartition join on UDT column. -SET citus.task_executor_type = 'task-tracker'; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -SET citus.log_multi_join_order = true; - --- Query that should result in a repartition --- join on int column, and be empty -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.pk = repartition_udt_other.pk; - -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.udtcol = repartition_udt_other.udtcol - WHERE repartition_udt.pk > 1 - ORDER BY repartition_udt.pk; diff --git a/src/test/regress/sql/multi_mx_repartition_udt_w2.sql b/src/test/regress/sql/multi_mx_repartition_udt_w2.sql deleted file mode 100644 index 9c6fca314..000000000 --- a/src/test/regress/sql/multi_mx_repartition_udt_w2.sql +++ /dev/null @@ -1,21 +0,0 @@ --- --- MULTI_MX_REPARTITION_W2_UDT --- - -\c - - - :worker_2_port -SET client_min_messages = LOG; --- Query that should result in a repartition join on UDT column. -SET citus.task_executor_type = 'task-tracker'; -SET citus.max_adaptive_executor_pool_size TO 2; -SET citus.enable_repartition_joins to ON; -SET citus.log_multi_join_order = true; - --- Query that should result in a repartition --- join on int column, and be empty. -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.pk = repartition_udt_other.pk; - -SELECT * FROM repartition_udt JOIN repartition_udt_other - ON repartition_udt.udtcol = repartition_udt_other.udtcol - WHERE repartition_udt.pk > 1 - ORDER BY repartition_udt.pk;