From 0a7a173eeee3c40fbe501b2c8360f4f42dc04cd0 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Tue, 28 May 2019 12:11:30 +0200 Subject: [PATCH] Add order by to multi_mx_reference_table --- .../expected/multi_mx_reference_table.out | 21 ++++++++++++------ .../regress/sql/multi_mx_reference_table.sql | 22 +++++++++++++------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/test/regress/expected/multi_mx_reference_table.out b/src/test/regress/expected/multi_mx_reference_table.out index e7e938dbb..18e2a6695 100644 --- a/src/test/regress/expected/multi_mx_reference_table.out +++ b/src/test/regress/expected/multi_mx_reference_table.out @@ -764,7 +764,8 @@ SELECT FROM reference_table_test, colocated_table_test WHERE - colocated_table_test.value_1 = reference_table_test.value_1; + colocated_table_test.value_1 = reference_table_test.value_1 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ] value_1 --------- @@ -777,7 +778,8 @@ SELECT FROM reference_table_test, colocated_table_test WHERE - colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ] value_2 --------- @@ -790,7 +792,8 @@ SELECT FROM colocated_table_test, reference_table_test WHERE - reference_table_test.value_1 = colocated_table_test.value_1; + reference_table_test.value_1 = colocated_table_test.value_1 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ] value_2 --------- @@ -803,7 +806,8 @@ SELECT FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ][ cartesian product "colocated_table_test_2" ] ERROR: cannot perform distributed planning on this query DETAIL: Cartesian products are currently unsupported @@ -812,7 +816,8 @@ SELECT FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_1 = colocated_table_test_2.value_1 AND colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_1 = colocated_table_test_2.value_1 AND colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ][ local partition join "colocated_table_test_2" ] value_2 --------- @@ -826,7 +831,8 @@ SELECT FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_2 = colocated_table_test_2.value_2 AND colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = colocated_table_test_2.value_2 AND colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ][ dual partition join "colocated_table_test_2" ] value_2 --------- @@ -839,7 +845,8 @@ SELECT FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_1 = reference_table_test.value_1 AND colocated_table_test_2.value_1 = reference_table_test.value_1; + colocated_table_test.value_1 = reference_table_test.value_1 AND colocated_table_test_2.value_1 = reference_table_test.value_1 +ORDER BY 1; LOG: join order: [ "colocated_table_test" ][ reference join "reference_table_test" ][ dual partition join "colocated_table_test_2" ] value_2 --------- diff --git a/src/test/regress/sql/multi_mx_reference_table.sql b/src/test/regress/sql/multi_mx_reference_table.sql index 84d002e9e..5b1c439dc 100644 --- a/src/test/regress/sql/multi_mx_reference_table.sql +++ b/src/test/regress/sql/multi_mx_reference_table.sql @@ -476,35 +476,41 @@ SELECT FROM reference_table_test, colocated_table_test WHERE - colocated_table_test.value_1 = reference_table_test.value_1; + colocated_table_test.value_1 = reference_table_test.value_1 +ORDER BY 1; SELECT colocated_table_test.value_2 FROM reference_table_test, colocated_table_test WHERE - colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; SELECT colocated_table_test.value_2 FROM colocated_table_test, reference_table_test WHERE - reference_table_test.value_1 = colocated_table_test.value_1; + reference_table_test.value_1 = colocated_table_test.value_1 +ORDER BY 1; + SELECT colocated_table_test.value_2 FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; SELECT colocated_table_test.value_2 FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_1 = colocated_table_test_2.value_1 AND colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_1 = colocated_table_test_2.value_1 AND colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; SET citus.task_executor_type to "task-tracker"; SELECT @@ -512,14 +518,16 @@ SELECT FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_2 = colocated_table_test_2.value_2 AND colocated_table_test.value_2 = reference_table_test.value_2; + colocated_table_test.value_2 = colocated_table_test_2.value_2 AND colocated_table_test.value_2 = reference_table_test.value_2 +ORDER BY 1; SELECT reference_table_test.value_2 FROM reference_table_test, colocated_table_test, colocated_table_test_2 WHERE - colocated_table_test.value_1 = reference_table_test.value_1 AND colocated_table_test_2.value_1 = reference_table_test.value_1; + colocated_table_test.value_1 = reference_table_test.value_1 AND colocated_table_test_2.value_1 = reference_table_test.value_1 +ORDER BY 1; SET client_min_messages TO NOTICE;