You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2022/10/04 12:56:34 UTC
[doris] branch master updated: [fix](test) try to let cases run in parallel (#13114)
This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d10ab474f4 [fix](test) try to let cases run in parallel (#13114)
d10ab474f4 is described below
commit d10ab474f45e47111345d56ddc4aec3bd6b1b0b1
Author: Yongqiang YANG <98...@users.noreply.github.com>
AuthorDate: Tue Oct 4 20:56:22 2022 +0800
[fix](test) try to let cases run in parallel (#13114)
---
regression-test/data/insert_p0/insert.out | 258 ++++++++++-----------
.../ssb_unique_sql_zstd_p0/sql/q1.1.out | 0
.../ssb_unique_sql_zstd_p0/sql/q1.2.out | 0
.../ssb_unique_sql_zstd_p0/sql/q1.3.out | 0
.../ssb_unique_sql_zstd_p0/sql/q2.1.out | 0
.../ssb_unique_sql_zstd_p0/sql/q2.2.out | 0
.../ssb_unique_sql_zstd_p0/sql/q2.3.out | 0
.../ssb_unique_sql_zstd_p0/sql/q3.1.out | 0
.../ssb_unique_sql_zstd_p0/sql/q3.2.out | 0
.../ssb_unique_sql_zstd_p0/sql/q3.3.out | 0
.../ssb_unique_sql_zstd_p0/sql/q3.4.out | 0
.../ssb_unique_sql_zstd_p0/sql/q4.1.out | 0
.../ssb_unique_sql_zstd_p0/sql/q4.2.out | 0
.../ssb_unique_sql_zstd_p0/sql/q4.3.out | 0
.../data/sql_block_rule_p0/test_sql_block_rule.out | 1 -
.../apache/doris/regression/RegressionTest.groovy | 22 +-
.../correctness_p0/test_first_value_window.groovy | 2 +-
.../test_join_with_projection.groovy | 22 +-
.../correctness_p0/test_last_value_window.groovy | 4 +-
.../correctness_p0/test_min_max_window.groovy | 2 +-
.../correctness_p0/test_no_grouping_window.groovy | 12 +-
.../correctness_p0/test_outer_join_sort.groovy | 28 +--
.../test_outer_join_with_cross_join.groovy | 36 +--
.../test_outer_join_with_order_by.groovy | 36 +--
regression-test/suites/insert_p0/insert.groovy | 2 +-
...n_column_exclude_schema_without_jsonpath.groovy | 3 +-
.../stream_load/load_json_null_to_nullable.groovy | 5 +-
.../stream_load/load_json_with_jsonpath.groovy | 3 +-
.../ddl/customer_create.sql | 0
.../ddl/customer_delete.sql | 0
.../ddl/customer_part_delete.sql | 0
.../ddl/customer_sequence_create.sql | 0
.../ssb_unique_load_zstd_p0/ddl/date_create.sql | 0
.../ssb_unique_load_zstd_p0/ddl/date_delete.sql | 0
.../ddl/date_part_delete.sql | 0
.../ddl/date_sequence_create.sql | 0
.../ddl/lineorder_create.sql | 0
.../ddl/lineorder_delete.sql | 0
.../ddl/lineorder_part_delete.sql | 0
.../ddl/lineorder_sequence_create.sql | 0
.../ssb_unique_load_zstd_p0/ddl/part_create.sql | 0
.../ssb_unique_load_zstd_p0/ddl/part_delete.sql | 0
.../ddl/part_part_delete.sql | 0
.../ddl/part_sequence_create.sql | 0
.../ddl/supplier_create.sql | 0
.../ddl/supplier_delete.sql | 0
.../ddl/supplier_part_delete.sql | 0
.../ddl/supplier_sequence_create.sql | 0
.../four}/load_four_step.groovy | 4 +-
.../one}/load_one_step.groovy | 6 +-
.../three}/load_three_step.groovy | 4 +-
.../two}/load_two_step.groovy | 4 +-
.../ssb_unique_sql_zstd_p0/ddl/customer_create.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/customer_delete.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/date_create.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/date_delete.sql | 0
.../ddl/lineorder_create.sql | 0
.../ddl/lineorder_delete.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/part_create.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/part_delete.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/supplier_create.sql | 0
.../ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql | 0
.../ssb_unique_sql_zstd_p0/load.groovy | 2 +-
.../ssb_unique_sql_zstd_p0/sql/q1.1.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q1.2.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q1.3.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q2.1.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q2.2.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q2.3.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q3.1.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q3.2.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q3.3.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q3.4.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q4.1.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q4.2.sql | 0
.../ssb_unique_sql_zstd_p0/sql/q4.3.sql | 0
.../test_pk_uk_case.groovy | 0
.../test_primary_key_simple_case.groovy | 0
.../sql_block_rule_p0/test_sql_block_rule.groovy | 4 +-
regression-test/suites/ssb_sf1/load.groovy | 3 +-
.../load.groovy} | 4 +-
.../load_one_step/load.groovy} | 2 +-
.../load_three_step/load.groovy} | 4 +-
.../load.groovy} | 4 +-
.../suites/ssb_unique_sql_zstd_p0/load.groovy | 2 +-
.../suites/tpch_unique_sql_zstd_p0/load.groovy | 4 +-
86 files changed, 248 insertions(+), 235 deletions(-)
diff --git a/regression-test/data/insert_p0/insert.out b/regression-test/data/insert_p0/insert.out
index 1c2ac24944..39756a4193 100644
--- a/regression-test/data/insert_p0/insert.out
+++ b/regression-test/data/insert_p0/insert.out
@@ -1,45 +1,18 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !insert --
-12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
-100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
-100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
-964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
-5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
-1 98.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+\N \N \N \N \N \N \N \N
+\N \N \N \N \N \N \N \N
+\N 98.52 \N \N \N true 181.18 \N
+\N 98.52 \N \N \N true 181.18 \N
+\N 98.52 \N \N \N true 181.18 \N
+\N 98.52 \N \N \N true 181.18 \N
+\N 98.52 \N \N \N true 181.18 \N
+\N 113.52 \N \N \N true 90.59 \N
+\N 113.52 \N \N \N true 90.59 \N
+1 \N abc 2014-01-01 \N false 123.22 123456789012345678.012345678
1 \N abc 2014-01-01 \N false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 12.25 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 0.245 abc 2014-01-01 2005-01-09T04:05:06 false 123.22 123456789012345678.012345678
-1 12.25 abc 2014-01-01 2002-01-07T01:05:06 false 123.22 123456789012345678.012345678
-1 99.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 9.8777 abc 2014-01-01 2010-01-02T05:09:06 false 123.22 123456789012345678.012345678
-1 12.8788 abc 2014-01-01 2010-01-02T02:05:06 false 123.22 123456789012345678.012345678
-1 55.52 abc 2014-01-01 1989-01-08T04:05:06 false 123.22 123456789012345678.012345678
-1 12.25 abc 2014-01-01 1999-01-08T02:05:06 false 123.22 123456789012345678.012345678
-1 98.52 abc 2014-01-01 \N false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 2.1 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-\N \N \N \N \N \N \N \N
+1 0.245 abc 2014-01-01 2005-01-09T04:05:06 false 123.22 123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
@@ -48,43 +21,6 @@
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
-4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
-4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
-\N 113.52 \N \N \N true 90.59 \N
-60 27.25 String1 1999-01-08 1999-01-08T02:05:06 true 61.61 0
-125 70.52000000000001 test 1952-01-05 1989-01-08T04:05:06 false 160.61 0
-500 27.25 testing 1949-07-08 2002-01-07T01:05:06 true -196.61 0
-500 114.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
-500 24.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 5.01 2
-500 27.8788 string1 1922-04-02 2010-01-02T02:05:06 true 500 0
-4820 15.245 Again 1936-02-08 2005-01-09T04:05:06 false 166.91 0
-25000 82.87 testing \N 2010-01-02T04:03:06 \N \N \N
-26260 27.25 sample 1987-04-09 2010-01-02T04:03:06 true 61.5 1
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true -500 0
-28740 82.87 Sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-30000 \N \N 1987-04-06 \N true \N \N
-44980 113.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 0
-\N 98.52 \N \N \N true 181.18 \N
-12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
-25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
-100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
-100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
-100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
-964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
-5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
-5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
-5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
-6000 \N \N 1987-04-06 \N true \N \N
-8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
-\N 98.52 \N \N \N true 181.18 \N
-\N 113.52 \N \N \N true 90.59 \N
-\N \N \N \N \N \N \N \N
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
@@ -93,6 +29,8 @@
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
1 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
+1 2.1 abc 2014-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
+1 2.1 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
1 2.1 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
@@ -110,95 +48,157 @@
1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
-1 98.52 abc 2014-01-01 \N false 123.22 123456789012345678.012345678
-1 12.25 abc 2014-01-01 1999-01-08T02:05:06 false 123.22 123456789012345678.012345678
-1 55.52 abc 2014-01-01 1989-01-08T04:05:06 false 123.22 123456789012345678.012345678
-1 12.8788 abc 2014-01-01 2010-01-02T02:05:06 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.2 abc 2014-01-01 2015-01-01T03:15:16 false 123.22 123456789012345678.012345678
+1 2.34567 a 2014-01-01 2015-01-01T03:15:16 true 123.22 123456789012345678.012345678
1 9.8777 abc 2014-01-01 2010-01-02T05:09:06 false 123.22 123456789012345678.012345678
-1 99.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 9.8777 abc 2014-01-01 2010-01-02T05:09:06 false 123.22 123456789012345678.012345678
+1 12.25 abc 2014-01-01 1999-01-08T02:05:06 false 123.22 123456789012345678.012345678
+1 12.25 abc 2014-01-01 1999-01-08T02:05:06 false 123.22 123456789012345678.012345678
1 12.25 abc 2014-01-01 2002-01-07T01:05:06 false 123.22 123456789012345678.012345678
-1 0.245 abc 2014-01-01 2005-01-09T04:05:06 false 123.22 123456789012345678.012345678
-1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 12.25 abc 2014-01-01 2002-01-07T01:05:06 false 123.22 123456789012345678.012345678
+1 12.25 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 12.25 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 12.8788 abc 2014-01-01 2010-01-02T02:05:06 false 123.22 123456789012345678.012345678
+1 12.8788 abc 2014-01-01 2010-01-02T02:05:06 false 123.22 123456789012345678.012345678
+1 55.52 abc 2014-01-01 1989-01-08T04:05:06 false 123.22 123456789012345678.012345678
+1 55.52 abc 2014-01-01 1989-01-08T04:05:06 false 123.22 123456789012345678.012345678
1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
-1 \N abc 2014-01-01 \N false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 67.87 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 98.52 abc 2014-01-01 \N false 123.22 123456789012345678.012345678
+1 98.52 abc 2014-01-01 \N false 123.22 123456789012345678.012345678
+1 98.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
1 98.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 99.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+1 99.8777 abc 2014-01-01 2010-01-02T04:03:06 false 123.22 123456789012345678.012345678
+4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
+4 1.1 a 2016-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
+12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
+12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
+12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
+12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
+12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
+25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
+25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
+25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
+50 9.1 abc 2014-01-01 2015-01-01T03:15:16 true 123.22 123456789012345678.012345678
+60 27.25 String1 1999-01-08 1999-01-08T02:05:06 true 61.61 0
60 27.25 String1 1999-01-08 1999-01-08T02:05:06 true 61.61 0
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
-100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
-100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
+100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
+100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
+100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
+100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
+100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
+100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
+100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
+100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
+100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
+100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+125 70.52000000000001 test 1952-01-05 1989-01-08T04:05:06 false 160.61 0
125 70.52000000000001 test 1952-01-05 1989-01-08T04:05:06 false 160.61 0
-500 27.8788 string1 1922-04-02 2010-01-02T02:05:06 true 500 0
500 24.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 5.01 2
-500 114.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+500 24.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 5.01 2
500 27.25 testing 1949-07-08 2002-01-07T01:05:06 true -196.61 0
+500 27.25 testing 1949-07-08 2002-01-07T01:05:06 true -196.61 0
+500 27.8788 string1 1922-04-02 2010-01-02T02:05:06 true 500 0
+500 27.8788 string1 1922-04-02 2010-01-02T02:05:06 true 500 0
+500 114.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+500 114.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
+964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
-4820 15.245 Again 1936-02-08 2005-01-09T04:05:06 false 166.91 0
-5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
-5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
-5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
-5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
-6000 \N \N 1987-04-06 \N true \N \N
-8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
-25000 82.87 testing \N 2010-01-02T04:03:06 \N \N \N
-26260 27.25 sample 1987-04-09 2010-01-02T04:03:06 true 61.5 1
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-28740 82.87 Sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
-28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true -500 0
-30000 \N \N 1987-04-06 \N true \N \N
-44980 113.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 0
-\N 98.52 \N \N \N true 181.18 \N
-\N 98.52 \N \N \N true 181.18 \N
-12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
-12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
-25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
-25 55.52 test 1952-01-05 1989-01-08T04:05:06 false 321.21 -123456789012345678.900123456
-100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
-100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
-100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
-100 12.25 testing 1949-07-08 2002-01-07T01:05:06 true -393.22 -987654321098765432.109876543
-100 99.8777 AGAIN 1987-04-09 2010-01-02T04:03:06 true 0 0
-100 9.8777 STRING1 1923-04-08 2010-01-02T05:09:06 true 10.01 2
-100 12.8788 string1 1922-04-02 2010-01-02T02:05:06 true 999.99 -999999999999999999.999999999
964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
+964 0.245 Again 1936-02-08 2005-01-09T04:05:06 false 333.82 987654321098765432.109876543
+4820 15.245 Again 1936-02-08 2005-01-09T04:05:06 false 166.91 0
+4820 15.245 Again 1936-02-08 2005-01-09T04:05:06 false 166.91 0
+5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
+5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
5000 67.87 testing \N 2010-01-02T04:03:06 \N \N \N
5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
+5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
+5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
+5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
+5252 12.25 sample 1987-04-09 2010-01-02T04:03:06 true 123 1
+5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
+5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
+5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
-5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true -999.99 0
-5748 67.87 Sample 1987-04-06 2010-01-02T04:03:06 true 181.18 0
5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
+5748 67.87 sample 1987-04-06 2010-01-02T04:03:06 true 181.18 123456789012345678.900123456
+6000 \N \N 1987-04-06 \N true \N \N
+6000 \N \N 1987-04-06 \N true \N \N
6000 \N \N 1987-04-06 \N true \N \N
6000 \N \N 1987-04-06 \N true \N \N
8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
-\N 98.52 \N \N \N true 181.18 \N
-12 12.25 String1 1999-01-08 1999-01-08T02:05:06 true 123.22 123456789012345678.900123456
-1 2.34567 a 2014-01-01 2015-01-01T03:15:16 true 123.22 123456789012345678.012345678
-1 2.1 abc 2014-01-01 2015-01-01T03:15:16 false -123.22 -123456789012345678.012345678
-50 9.1 abc 2014-01-01 2015-01-01T03:15:16 true 123.22 123456789012345678.012345678
+8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
+8996 98.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 999999999999999999.999999999
+25000 82.87 testing \N 2010-01-02T04:03:06 \N \N \N
+25000 82.87 testing \N 2010-01-02T04:03:06 \N \N \N
+26260 27.25 sample 1987-04-09 2010-01-02T04:03:06 true 61.5 1
+26260 27.25 sample 1987-04-09 2010-01-02T04:03:06 true 61.5 1
+28740 82.87 Sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+28740 82.87 Sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true -500 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true -500 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+28740 82.87 sample 1987-04-06 2010-01-02T04:03:06 true 90.59 0
+30000 \N \N 1987-04-06 \N true \N \N
+30000 \N \N 1987-04-06 \N true \N \N
+44980 113.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 0
+44980 113.8777 again 1987-04-09 2010-01-02T04:03:06 false -0.01 0
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.1.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.1.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.2.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.2.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.3.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q1.3.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.1.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.1.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.2.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.2.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.3.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q2.3.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.1.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.1.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.2.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.2.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.3.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.3.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.4.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q3.4.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.1.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.1.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.2.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.2.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.out
diff --git a/regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.3.out b/regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out
similarity index 100%
rename from regression-test/data/primary_key/ssb_unique_sql_zstd_p0/sql/q4.3.out
rename to regression-test/data/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.out
diff --git a/regression-test/data/sql_block_rule_p0/test_sql_block_rule.out b/regression-test/data/sql_block_rule_p0/test_sql_block_rule.out
index b67b454169..f958424e65 100644
--- a/regression-test/data/sql_block_rule_p0/test_sql_block_rule.out
+++ b/regression-test/data/sql_block_rule_p0/test_sql_block_rule.out
@@ -1,4 +1,3 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !select --
-test_rule_num NULL NULL 0 1 0 true true
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
index 899fcf2b41..a3f9ca4daf 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
@@ -32,6 +32,7 @@ import org.apache.doris.regression.suite.event.TeamcityEventListener
import org.apache.doris.regression.util.Recorder
import groovy.util.logging.Slf4j
import org.apache.commons.cli.*
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.codehaus.groovy.control.CompilerConfiguration
import java.beans.Introspector
@@ -82,9 +83,24 @@ class RegressionTest {
compileConfig = new CompilerConfiguration()
compileConfig.setScriptBaseClass((SuiteScript as Class).name)
shell = new GroovyShell(classloader, new Binding(), compileConfig)
- scriptExecutors = Executors.newFixedThreadPool(config.parallel)
- suiteExecutors = Executors.newFixedThreadPool(config.suiteParallel)
- actionExecutors = Executors.newFixedThreadPool(config.actionParallel)
+
+ BasicThreadFactory scriptFactory = new BasicThreadFactory.Builder()
+ .namingPattern("script-thread-%d")
+ .priority(Thread.MAX_PRIORITY)
+ .build();
+ scriptExecutors = Executors.newFixedThreadPool(config.parallel, scriptFactory)
+
+ BasicThreadFactory suiteFactory = new BasicThreadFactory.Builder()
+ .namingPattern("suite-thread-%d")
+ .priority(Thread.MAX_PRIORITY)
+ .build();
+ suiteExecutors = Executors.newFixedThreadPool(config.suiteParallel, suiteFactory)
+
+ BasicThreadFactory actionFactory = new BasicThreadFactory.Builder()
+ .namingPattern("action-thread-%d")
+ .priority(Thread.MAX_PRIORITY)
+ .build();
+ actionExecutors = Executors.newFixedThreadPool(config.actionParallel, actionFactory)
loadPlugins(config)
}
diff --git a/regression-test/suites/correctness_p0/test_first_value_window.groovy b/regression-test/suites/correctness_p0/test_first_value_window.groovy
index 2819f79277..c2c2bca291 100644
--- a/regression-test/suites/correctness_p0/test_first_value_window.groovy
+++ b/regression-test/suites/correctness_p0/test_first_value_window.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_first_value_window") {
- def tableName = "state"
+ def tableName = "test_first_value_window_state"
sql """ DROP TABLE IF EXISTS ${tableName} """
diff --git a/regression-test/suites/correctness_p0/test_join_with_projection.groovy b/regression-test/suites/correctness_p0/test_join_with_projection.groovy
index 62b7cccda6..212be8aec3 100644
--- a/regression-test/suites/correctness_p0/test_join_with_projection.groovy
+++ b/regression-test/suites/correctness_p0/test_join_with_projection.groovy
@@ -17,15 +17,15 @@
suite("test_join_with_projection") {
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_join_with_projection_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_join_with_projection_outerjoin_B;
"""
sql """
- create table outerjoin_A ( a int not null )
+ create table test_join_with_projection_outerjoin_A ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -36,7 +36,7 @@ suite("test_join_with_projection") {
"""
sql """
- create table outerjoin_B ( a int not null )
+ create table test_join_with_projection_outerjoin_B ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -47,11 +47,11 @@ suite("test_join_with_projection") {
"""
sql """
- insert into outerjoin_A values( 1 );
+ insert into test_join_with_projection_outerjoin_A values( 1 );
"""
sql """
- insert into outerjoin_B values( 1 );
+ insert into test_join_with_projection_outerjoin_B values( 1 );
"""
qt_select """
@@ -63,20 +63,20 @@ suite("test_join_with_projection") {
END AS c0
FROM
(SELECT a AS c0
- FROM outerjoin_A
+ FROM test_join_with_projection_outerjoin_A
) AS subq_1
RIGHT JOIN
(SELECT a AS c0
- FROM outerjoin_B
+ FROM test_join_with_projection_outerjoin_B
) AS subq_2
ON (subq_1.c0 = subq_2.c0 );
"""
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_join_with_projection_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_join_with_projection_outerjoin_B;
"""
-}
\ No newline at end of file
+}
diff --git a/regression-test/suites/correctness_p0/test_last_value_window.groovy b/regression-test/suites/correctness_p0/test_last_value_window.groovy
index 20d915d3fd..bf9a756798 100644
--- a/regression-test/suites/correctness_p0/test_last_value_window.groovy
+++ b/regression-test/suites/correctness_p0/test_last_value_window.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_last_value_window") {
- def tableName = "state"
+ def tableName = "test_last_value_window_state"
sql """ DROP TABLE IF EXISTS ${tableName} """
@@ -48,4 +48,4 @@ suite("test_last_value_window") {
qt_select_default """ select *,last_value(state) over(partition by myday order by time_col) from ${tableName} order by myday, time_col, state; """
-}
\ No newline at end of file
+}
diff --git a/regression-test/suites/correctness_p0/test_min_max_window.groovy b/regression-test/suites/correctness_p0/test_min_max_window.groovy
index ccae21b8cf..c81961362b 100644
--- a/regression-test/suites/correctness_p0/test_min_max_window.groovy
+++ b/regression-test/suites/correctness_p0/test_min_max_window.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_min_max_window") {
- def tableName = "state"
+ def tableName = "test_min_max_window_state"
sql """ DROP TABLE IF EXISTS ${tableName} """
diff --git a/regression-test/suites/correctness_p0/test_no_grouping_window.groovy b/regression-test/suites/correctness_p0/test_no_grouping_window.groovy
index 3a0f52731c..8cfe83c302 100644
--- a/regression-test/suites/correctness_p0/test_no_grouping_window.groovy
+++ b/regression-test/suites/correctness_p0/test_no_grouping_window.groovy
@@ -17,11 +17,11 @@
suite("test_no_grouping_window") {
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_no_grouping_window_outerjoin_A;
"""
sql """
- create table outerjoin_A ( a int not null )
+ create table test_no_grouping_window_outerjoin_A ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -32,14 +32,14 @@ suite("test_no_grouping_window") {
"""
sql """
- insert into outerjoin_A values( 1 );
+ insert into test_no_grouping_window_outerjoin_A values( 1 );
"""
qt_select """
- select avg( a ) over ( partition by a order by a ) * 23 from outerjoin_A;
+ select avg( a ) over ( partition by a order by a ) * 23 from test_no_grouping_window_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_no_grouping_window_outerjoin_A;
"""
-}
\ No newline at end of file
+}
diff --git a/regression-test/suites/correctness_p0/test_outer_join_sort.groovy b/regression-test/suites/correctness_p0/test_outer_join_sort.groovy
index 93b575627f..4d8bd9a76b 100644
--- a/regression-test/suites/correctness_p0/test_outer_join_sort.groovy
+++ b/regression-test/suites/correctness_p0/test_outer_join_sort.groovy
@@ -17,11 +17,11 @@
suite("test_outer_join_sort") {
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_test_outer_join_sort_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_sort_outerjoin_B;
"""
sql """
@@ -29,7 +29,7 @@ suite("test_outer_join_sort") {
"""
sql """
- create table outerjoin_A ( a int not null )
+ create table test_test_outer_join_sort_outerjoin_A ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -40,7 +40,7 @@ suite("test_outer_join_sort") {
"""
sql """
- create table outerjoin_B ( a int not null )
+ create table test_outer_join_sort_outerjoin_B ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -62,11 +62,11 @@ suite("test_outer_join_sort") {
"""
sql """
- insert into outerjoin_A values( 1 );
+ insert into test_test_outer_join_sort_outerjoin_A values( 1 );
"""
sql """
- insert into outerjoin_B values( 1 );
+ insert into test_outer_join_sort_outerjoin_B values( 1 );
"""
sql """
@@ -76,28 +76,28 @@ suite("test_outer_join_sort") {
qt_select """
select
bitand(
- outerjoin_A.`a` ,
- outerjoin_A.`a` ) as c0
+ test_test_outer_join_sort_outerjoin_A.`a` ,
+ test_test_outer_join_sort_outerjoin_A.`a` ) as c0
from
- outerjoin_A
+ test_test_outer_join_sort_outerjoin_A
inner join (select
- outerjoin_B.a as c3
+ test_outer_join_sort_outerjoin_B.a as c3
from
- outerjoin_B
+ test_outer_join_sort_outerjoin_B
) as subq_0
- on (outerjoin_A.a = subq_0.c3 )
+ on (test_test_outer_join_sort_outerjoin_A.a = subq_0.c3 )
right join outerjoin_C as ref_83
on (subq_0.c3 = ref_83.a )
order by subq_0.`c3`;
"""
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_test_outer_join_sort_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_sort_outerjoin_B;
"""
sql """
diff --git a/regression-test/suites/correctness_p0/test_outer_join_with_cross_join.groovy b/regression-test/suites/correctness_p0/test_outer_join_with_cross_join.groovy
index f2162e8174..4ecd19280e 100644
--- a/regression-test/suites/correctness_p0/test_outer_join_with_cross_join.groovy
+++ b/regression-test/suites/correctness_p0/test_outer_join_with_cross_join.groovy
@@ -17,23 +17,23 @@
suite("test_outer_join_with_cross_join") {
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_B;
"""
sql """
- drop table if exists outerjoin_C;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_C;
"""
sql """
- drop table if exists outerjoin_D;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_D;
"""
sql """
- create table outerjoin_A ( a int not null )
+ create table test_outer_join_with_cross_join_outerjoin_A ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -44,7 +44,7 @@ suite("test_outer_join_with_cross_join") {
"""
sql """
- create table outerjoin_B ( a int not null )
+ create table test_outer_join_with_cross_join_outerjoin_B ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -55,7 +55,7 @@ suite("test_outer_join_with_cross_join") {
"""
sql """
- create table outerjoin_C ( a int not null )
+ create table test_outer_join_with_cross_join_outerjoin_C ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -66,7 +66,7 @@ suite("test_outer_join_with_cross_join") {
"""
sql """
- create table outerjoin_D ( a int not null )
+ create table test_outer_join_with_cross_join_outerjoin_D ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -77,39 +77,39 @@ suite("test_outer_join_with_cross_join") {
"""
sql """
- insert into outerjoin_A values( 1 );
+ insert into test_outer_join_with_cross_join_outerjoin_A values( 1 );
"""
sql """
- insert into outerjoin_B values( 1 );
+ insert into test_outer_join_with_cross_join_outerjoin_B values( 1 );
"""
sql """
- insert into outerjoin_C values( 1 );
+ insert into test_outer_join_with_cross_join_outerjoin_C values( 1 );
"""
sql """
- insert into outerjoin_D values( 1 );
+ insert into test_outer_join_with_cross_join_outerjoin_D values( 1 );
"""
qt_select """
- select outerjoin_B.a from outerjoin_A left join outerjoin_B on outerjoin_A.a = outerjoin_B.a
- inner join outerjoin_C on true left join outerjoin_D on outerjoin_B.a = outerjoin_D.a;
+ select test_outer_join_with_cross_join_outerjoin_B.a from test_outer_join_with_cross_join_outerjoin_A left join test_outer_join_with_cross_join_outerjoin_B on test_outer_join_with_cross_join_outerjoin_A.a = test_outer_join_with_cross_join_outerjoin_B.a
+ inner join test_outer_join_with_cross_join_outerjoin_C on true left join test_outer_join_with_cross_join_outerjoin_D on test_outer_join_with_cross_join_outerjoin_B.a = test_outer_join_with_cross_join_outerjoin_D.a;
"""
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_B;
"""
sql """
- drop table if exists outerjoin_C;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_C;
"""
sql """
- drop table if exists outerjoin_D;
+ drop table if exists test_outer_join_with_cross_join_outerjoin_D;
"""
}
diff --git a/regression-test/suites/correctness_p0/test_outer_join_with_order_by.groovy b/regression-test/suites/correctness_p0/test_outer_join_with_order_by.groovy
index 312529afcd..1151ae0844 100644
--- a/regression-test/suites/correctness_p0/test_outer_join_with_order_by.groovy
+++ b/regression-test/suites/correctness_p0/test_outer_join_with_order_by.groovy
@@ -17,19 +17,19 @@
suite("test_outer_join_with_order_by") {
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_outer_join_with_order_by_outer_join_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_with_order_by_outer_join_B;
"""
sql """
- drop table if exists outerjoin_C;
+ drop table if exists test_outer_join_with_order_by_outer_join_C;
"""
sql """
- create table outerjoin_A ( a int not null )
+ create table test_outer_join_with_order_by_outer_join_A ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -40,7 +40,7 @@ suite("test_outer_join_with_order_by") {
"""
sql """
- create table outerjoin_B ( a int not null )
+ create table test_outer_join_with_order_by_outer_join_B ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -51,7 +51,7 @@ suite("test_outer_join_with_order_by") {
"""
sql """
- create table outerjoin_C ( a int not null )
+ create table test_outer_join_with_order_by_outer_join_C ( a int not null )
ENGINE=OLAP
DISTRIBUTED BY HASH(a) BUCKETS 1
PROPERTIES (
@@ -62,20 +62,20 @@ suite("test_outer_join_with_order_by") {
"""
sql """
- insert into outerjoin_A values( 1 );
+ insert into test_outer_join_with_order_by_outer_join_A values( 1 );
"""
sql """
- insert into outerjoin_B values( 1 );
+ insert into test_outer_join_with_order_by_outer_join_B values( 1 );
"""
sql """
- insert into outerjoin_C values( 1 );
+ insert into test_outer_join_with_order_by_outer_join_C values( 1 );
"""
qt_select """
- select case when outerjoin_A.a <= outerjoin_A.a then outerjoin_A.a else outerjoin_A.a end as r
- from outerjoin_A right join outerjoin_B on outerjoin_A.a = outerjoin_B.a order by outerjoin_A.a;
+ select case when test_outer_join_with_order_by_outer_join_A.a <= test_outer_join_with_order_by_outer_join_A.a then test_outer_join_with_order_by_outer_join_A.a else test_outer_join_with_order_by_outer_join_A.a end as r
+ from test_outer_join_with_order_by_outer_join_A right join test_outer_join_with_order_by_outer_join_B on test_outer_join_with_order_by_outer_join_A.a = test_outer_join_with_order_by_outer_join_B.a order by test_outer_join_with_order_by_outer_join_A.a;
"""
qt_select """
@@ -89,23 +89,23 @@ suite("test_outer_join_with_order_by") {
select
ref_420.a as c9
from
- outerjoin_A as ref_420
- right join outerjoin_B as ref_421 on (ref_420.a = ref_421.a)
+ test_outer_join_with_order_by_outer_join_A as ref_420
+ right join test_outer_join_with_order_by_outer_join_B as ref_421 on (ref_420.a = ref_421.a)
) as subq_10
- left join outerjoin_C as ref_687 on (subq_10.`c9` = ref_687.a)
+ left join test_outer_join_with_order_by_outer_join_C as ref_687 on (subq_10.`c9` = ref_687.a)
order by
subq_10.`c9` desc;
"""
sql """
- drop table if exists outerjoin_A;
+ drop table if exists test_outer_join_with_order_by_outer_join_A;
"""
sql """
- drop table if exists outerjoin_B;
+ drop table if exists test_outer_join_with_order_by_outer_join_B;
"""
sql """
- drop table if exists outerjoin_C;
+ drop table if exists test_outer_join_with_order_by_outer_join_C;
"""
-}
\ No newline at end of file
+}
diff --git a/regression-test/suites/insert_p0/insert.groovy b/regression-test/suites/insert_p0/insert.groovy
index 2c1d8bd9a1..573d5d8366 100644
--- a/regression-test/suites/insert_p0/insert.groovy
+++ b/regression-test/suites/insert_p0/insert.groovy
@@ -81,6 +81,6 @@ suite("insert") {
sql """ insert into mutable_datatype values(5 * 10, cast(4.1 + 5 as double), 'abc', cast('2014-01-01' as date), cast('2015-01-01 03:15:16' as datetime), TRUE, '123.22', '123456789012345678.012345678') """
sql "sync"
- qt_insert """ select * from mutable_datatype """
+ qt_insert """ select * from mutable_datatype order by c_bigint, c_double, c_string, c_date, c_timestamp, c_boolean, c_short_decimal"""
}
diff --git a/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy b/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy
index fbb64e29d0..f3edfd225c 100644
--- a/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy
+++ b/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy
@@ -17,8 +17,7 @@
suite("test_load_json_column_exclude_schema_without_jsonpath", "p0") {
// define a sql table
- def testTable = "tbl_test_json_load"
- def dbName = "test_query_db"
+ def testTable = "tbl_test_load_json_column_exclude_schema_without_jsonpath"
def create_test_table = {enable_vectorized_flag ->
if (enable_vectorized_flag) {
diff --git a/regression-test/suites/load_p0/stream_load/load_json_null_to_nullable.groovy b/regression-test/suites/load_p0/stream_load/load_json_null_to_nullable.groovy
index e9a5665e03..dcb5a6a46c 100644
--- a/regression-test/suites/load_p0/stream_load/load_json_null_to_nullable.groovy
+++ b/regression-test/suites/load_p0/stream_load/load_json_null_to_nullable.groovy
@@ -17,9 +17,8 @@
suite("test_load_json_null_to_nullable", "p0") {
// define a sql table
- def testTable = "tbl_test_json_load"
- def dbName = "test_query_db"
-
+ def testTable = "tbl_test_load_json_null_to_nullable"
+
def create_test_table = {enable_vectorized_flag ->
if (enable_vectorized_flag) {
sql """ set enable_vectorized_engine = true """
diff --git a/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy b/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
index b2fa65d8f0..b5fc9ea096 100644
--- a/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
+++ b/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
@@ -17,8 +17,7 @@
suite("test_load_json_with_jsonpath", "p0") {
// define a sql table
- def testTable = "tbl_test_json_load"
- def dbName = "test_query_db"
+ def testTable = "tbl_test_load_json_with_jsonpath"
def create_test_table = {enable_vectorized_flag ->
if (enable_vectorized_flag) {
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/customer_sequence_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/date_sequence_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/lineorder_sequence_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/part_sequence_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/ddl/supplier_sequence_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_four_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
similarity index 96%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_four_step.groovy
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
index 7ad667c441..b3f5853388 100644
--- a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_four_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
@@ -28,7 +28,7 @@ suite("load_four_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
for (j in 0..<2) {
streamLoad {
table tableName
@@ -63,7 +63,7 @@ suite("load_four_step") {
}
}
sql """ set delete_without_partition = true; """
- sql new File("""${context.file.parent}/ddl/${tableName}_part_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_part_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
similarity index 94%
rename from regression-test/suites/ssb_unique_load_zstd_p0/load_one_step.groovy
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
index 07ccea1c0f..68c8e98a88 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
@@ -25,12 +25,12 @@ suite("load_one_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_create.sql""").text
streamLoad {
- table tableName
+ table "${tableName}"
set 'column_separator', '|'
set 'compress_type', 'GZ'
- set 'columns', rows[0]
+ set 'columns', "${rows[0]}"
file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
similarity index 94%
rename from regression-test/suites/ssb_unique_load_zstd_p0/load_three_step.groovy
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
index 53e7e6d4dd..bbd9e0f4ba 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
@@ -25,7 +25,7 @@ suite("load_three_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
for (j in 0..<2) {
streamLoad {
table tableName
@@ -59,7 +59,7 @@ suite("load_three_step") {
assertTrue(loadRowCount[0][0] == rows[1])
}
}
- sql new File("""${context.file.parent}/ddl/${tableName}_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_two_step.groovy b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
similarity index 94%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_two_step.groovy
rename to regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
index 85b2de6480..4e2e7ae3b8 100644
--- a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_two_step.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
@@ -25,7 +25,7 @@ suite("load_two_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
streamLoad {
table tableName
set 'column_separator', '|'
@@ -57,7 +57,7 @@ suite("load_two_step") {
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows[1])
}
- sql new File("""${context.file.parent}/ddl/${tableName}_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/customer_create.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/customer_create.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/customer_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/date_create.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/date_create.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/date_delete.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/date_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/date_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/part_create.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/part_create.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/part_delete.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/part_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/part_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_create.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/ddl/supplier_delete.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/load.groovy b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
similarity index 99%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/load.groovy
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
index 3d442dc7fe..f0b795f83d 100644
--- a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
@@ -37,7 +37,7 @@ suite("load") {
sql new File("""${context.file.parent}/ddl/${table}_create.sql""").text
sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
}
- i = 0
+ def i = 0
for (String tableName in tables) {
streamLoad {
// a default db 'regression_test' is specified in
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.1.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.1.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.1.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.2.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.2.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.2.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.3.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q1.3.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q1.3.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.1.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.1.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.1.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.2.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.2.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.2.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.3.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q2.3.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q2.3.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.1.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.1.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.1.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.2.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.2.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.2.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.3.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.3.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.3.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.4.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q3.4.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q3.4.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.1.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.1.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.1.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.2.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.2.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.2.sql
diff --git a/regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.3.sql b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql
similarity index 100%
rename from regression-test/suites/primary_key/ssb_unique_sql_zstd_p0/sql/q4.3.sql
rename to regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/sql/q4.3.sql
diff --git a/regression-test/suites/primary_key/test_pk_uk_case.groovy b/regression-test/suites/primary_index/test_pk_uk_case.groovy
similarity index 100%
rename from regression-test/suites/primary_key/test_pk_uk_case.groovy
rename to regression-test/suites/primary_index/test_pk_uk_case.groovy
diff --git a/regression-test/suites/primary_key/test_primary_key_simple_case.groovy b/regression-test/suites/primary_index/test_primary_key_simple_case.groovy
similarity index 100%
rename from regression-test/suites/primary_key/test_primary_key_simple_case.groovy
rename to regression-test/suites/primary_index/test_primary_key_simple_case.groovy
diff --git a/regression-test/suites/sql_block_rule_p0/test_sql_block_rule.groovy b/regression-test/suites/sql_block_rule_p0/test_sql_block_rule.groovy
index a9734c8527..3108ed93d6 100644
--- a/regression-test/suites/sql_block_rule_p0/test_sql_block_rule.groovy
+++ b/regression-test/suites/sql_block_rule_p0/test_sql_block_rule.groovy
@@ -55,7 +55,7 @@ suite("test_sql_block_rule") {
sql """
SELECT * FROM table_2
"""
-
+/*
sql """
CREATE SQL_BLOCK_RULE if not exists test_rule_num
PROPERTIES("tablet_num"="1", "global"= "true", "enable"= "true")
@@ -65,7 +65,7 @@ suite("test_sql_block_rule") {
sql "SELECT * FROM table_2"
exception "sql hits sql block rule: test_rule_num, reach tablet_num : 1"
}
-
+*/
qt_select """
SHOW SQL_BLOCK_RULE
"""
diff --git a/regression-test/suites/ssb_sf1/load.groovy b/regression-test/suites/ssb_sf1/load.groovy
index af87726756..82372e2f82 100644
--- a/regression-test/suites/ssb_sf1/load.groovy
+++ b/regression-test/suites/ssb_sf1/load.groovy
@@ -40,7 +40,7 @@ suite("load") {
sql new File("""${context.file.parent}/ddl/${table}_create.sql""").text
sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
}
- i = 0
+ def i = 0
for (String tableName in tables) {
streamLoad {
// a default db 'regression_test' is specified in
@@ -110,6 +110,7 @@ suite("load") {
assertTrue(json.NumberLoadedRows > 0 && json.LoadBytes > 0)
}
}
+ log.info("yyq ${i} ${tableName} ${columns[i]}".toString())
i++
}
diff --git a/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step.groovy b/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
similarity index 96%
rename from regression-test/suites/ssb_unique_load_zstd_p0/load_four_step.groovy
rename to regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
index 7ad667c441..b3f5853388 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
@@ -28,7 +28,7 @@ suite("load_four_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
for (j in 0..<2) {
streamLoad {
table tableName
@@ -63,7 +63,7 @@ suite("load_four_step") {
}
}
sql """ set delete_without_partition = true; """
- sql new File("""${context.file.parent}/ddl/${tableName}_part_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_part_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_one_step.groovy b/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
similarity index 97%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_one_step.groovy
rename to regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
index 07ccea1c0f..dfe107a0bf 100644
--- a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_one_step.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
@@ -25,7 +25,7 @@ suite("load_one_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_create.sql""").text
streamLoad {
table tableName
set 'column_separator', '|'
diff --git a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_three_step.groovy b/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
similarity index 94%
rename from regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_three_step.groovy
rename to regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
index 53e7e6d4dd..bbd9e0f4ba 100644
--- a/regression-test/suites/primary_key/ssb_unique_load_zstd_p0/load_three_step.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
@@ -25,7 +25,7 @@ suite("load_three_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
for (j in 0..<2) {
streamLoad {
table tableName
@@ -59,7 +59,7 @@ suite("load_three_step") {
assertTrue(loadRowCount[0][0] == rows[1])
}
}
- sql new File("""${context.file.parent}/ddl/${tableName}_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step.groovy b/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
similarity index 94%
rename from regression-test/suites/ssb_unique_load_zstd_p0/load_two_step.groovy
rename to regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
index 85b2de6480..4e2e7ae3b8 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
@@ -25,7 +25,7 @@ suite("load_two_step") {
tables.each { tableName, rows ->
sql """ DROP TABLE IF EXISTS $tableName """
- sql new File("""${context.file.parent}/ddl/${tableName}_sequence_create.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_sequence_create.sql""").text
streamLoad {
table tableName
set 'column_separator', '|'
@@ -57,7 +57,7 @@ suite("load_two_step") {
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows[1])
}
- sql new File("""${context.file.parent}/ddl/${tableName}_delete.sql""").text
+ sql new File("""${context.file.parentFile.parent}/ddl/${tableName}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${tableName}"
logger.info("select ${tableName} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy b/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
index 3d442dc7fe..f0b795f83d 100644
--- a/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
@@ -37,7 +37,7 @@ suite("load") {
sql new File("""${context.file.parent}/ddl/${table}_create.sql""").text
sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
}
- i = 0
+ def i = 0
for (String tableName in tables) {
streamLoad {
// a default db 'regression_test' is specified in
diff --git a/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy b/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
index 8c3e114ebb..9b8d54a4da 100644
--- a/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
@@ -41,7 +41,7 @@ suite("load") {
streamLoad {
// a default db 'regression_test' is specified in
// ${DORIS_HOME}/conf/regression-conf.groovy
- table tableName
+ table "${tableName}"
// default label is UUID:
// set 'label' UUID.randomUUID().toString()
@@ -50,7 +50,7 @@ suite("load") {
// this line change to ','
set 'column_separator', '|'
set 'compress_type', 'GZ'
- set 'columns', columns[0]
+ set 'columns', "${columns[0]}"
// relate to ${DORIS_HOME}/regression-test/data/demo/streamload_input.csv.
// also, you can stream load a http stream, e.g. http://xxx/some.csv
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org