You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/04/22 11:17:57 UTC
[doris] 09/15: [fix](test)Move broker test to p2. Move test data to cos in Beijing region (#18893)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0-alpha
in repository https://gitbox.apache.org/repos/asf/doris.git
commit e3049f9709841cab0b4881b1900cc76f2fab6037
Author: Jibing-Li <64...@users.noreply.github.com>
AuthorDate: Fri Apr 21 22:15:52 2023 +0800
[fix](test)Move broker test to p2. Move test data to cos in Beijing region (#18893)
Fix broker load p2 test case error.
1. Move test data from cos Hong kong region to Beijing region.
2. Move broker load test to p2 group.
3. Fix error message mismatch error.
---
.../broker_load/test_broker_load.out | 0
.../broker_load/ddl/filter_create.sql | 0
.../broker_load/ddl/filter_drop.sql | 0
.../broker_load/ddl/null_default_create.sql | 0
.../broker_load/ddl/null_default_drop.sql | 0
.../broker_load/ddl/orc_s3_case1_create.sql | 0
.../broker_load/ddl/orc_s3_case1_drop.sql | 0
.../broker_load/ddl/orc_s3_case2_create.sql | 0
.../broker_load/ddl/orc_s3_case2_drop.sql | 0
.../broker_load/ddl/orc_s3_case3_create.sql | 0
.../broker_load/ddl/orc_s3_case3_drop.sql | 0
.../broker_load/ddl/orc_s3_case4_create.sql | 0
.../broker_load/ddl/orc_s3_case4_drop.sql | 0
.../broker_load/ddl/orc_s3_case5_create.sql | 0
.../broker_load/ddl/orc_s3_case5_drop.sql | 0
.../broker_load/ddl/orc_s3_case6_create.sql | 0
.../broker_load/ddl/orc_s3_case6_drop.sql | 0
.../broker_load/ddl/orc_s3_case7_create.sql | 0
.../broker_load/ddl/orc_s3_case7_drop.sql | 0
.../broker_load/ddl/orc_s3_case8_create.sql | 0
.../broker_load/ddl/orc_s3_case8_drop.sql | 0
.../broker_load/ddl/orc_s3_case9_create.sql | 0
.../broker_load/ddl/orc_s3_case9_drop.sql | 0
.../broker_load/ddl/parquet_s3_case1_create.sql | 0
.../broker_load/ddl/parquet_s3_case1_drop.sql | 0
.../broker_load/ddl/parquet_s3_case2_create.sql | 0
.../broker_load/ddl/parquet_s3_case2_drop.sql | 0
.../broker_load/ddl/parquet_s3_case3_create.sql | 0
.../broker_load/ddl/parquet_s3_case3_drop.sql | 0
.../broker_load/ddl/parquet_s3_case4_create.sql | 0
.../broker_load/ddl/parquet_s3_case4_drop.sql | 0
.../broker_load/ddl/parquet_s3_case5_create.sql | 0
.../broker_load/ddl/parquet_s3_case5_drop.sql | 0
.../broker_load/ddl/parquet_s3_case6_create.sql | 0
.../broker_load/ddl/parquet_s3_case6_drop.sql | 0
.../broker_load/ddl/parquet_s3_case7_create.sql | 0
.../broker_load/ddl/parquet_s3_case7_drop.sql | 0
.../broker_load/ddl/parquet_s3_case8_create.sql | 0
.../broker_load/ddl/parquet_s3_case8_drop.sql | 0
.../broker_load/ddl/parquet_s3_case9_create.sql | 0
.../broker_load/ddl/parquet_s3_case9_drop.sql | 0
.../broker_load/ddl/part_create.sql | 0
.../broker_load/ddl/part_drop.sql | 0
.../broker_load/ddl/path_column_create.sql | 0
.../broker_load/ddl/path_column_drop.sql | 0
.../broker_load/ddl/reverse_create.sql | 0
.../broker_load/ddl/reverse_drop.sql | 0
.../broker_load/ddl/set1_create.sql | 0
.../broker_load/ddl/set1_drop.sql | 0
.../broker_load/ddl/set2_create.sql | 0
.../broker_load/ddl/set2_drop.sql | 0
.../broker_load/ddl/set3_create.sql | 0
.../broker_load/ddl/set3_drop.sql | 0
.../broker_load/ddl/set4_create.sql | 0
.../broker_load/ddl/set4_drop.sql | 0
.../broker_load/ddl/set5_create.sql | 0
.../broker_load/ddl/set5_drop.sql | 0
.../broker_load/ddl/set6_create.sql | 0
.../broker_load/ddl/set6_drop.sql | 0
.../broker_load/ddl/set7_create.sql | 0
.../broker_load/ddl/set7_drop.sql | 0
.../broker_load/ddl/upper_case_create.sql | 0
.../broker_load/ddl/upper_case_drop.sql | 0
.../broker_load/test_broker_load.groovy | 77 +++++++++++-----------
64 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/regression-test/data/load_p0/broker_load/test_broker_load.out b/regression-test/data/load_p2/broker_load/test_broker_load.out
similarity index 100%
rename from regression-test/data/load_p0/broker_load/test_broker_load.out
rename to regression-test/data/load_p2/broker_load/test_broker_load.out
diff --git a/regression-test/suites/load_p0/broker_load/ddl/filter_create.sql b/regression-test/suites/load_p2/broker_load/ddl/filter_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/filter_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/filter_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/filter_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/filter_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/filter_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/filter_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/null_default_create.sql b/regression-test/suites/load_p2/broker_load/ddl/null_default_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/null_default_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/null_default_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/null_default_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/null_default_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/null_default_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/null_default_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case1_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case1_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case1_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case1_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case1_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case1_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case1_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case1_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case2_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case2_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case2_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case2_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case2_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case2_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case2_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case2_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case3_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case3_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case3_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case3_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case3_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case3_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case3_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case3_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case4_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case4_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case4_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case4_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case4_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case4_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case4_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case4_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case5_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case5_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case5_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case5_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case5_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case5_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case5_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case5_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case6_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case6_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case6_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case6_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case6_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case6_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case6_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case6_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case7_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case7_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case7_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case7_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case7_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case7_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case7_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case7_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case8_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case8_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case8_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case8_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case8_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case8_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case8_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case8_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case9_create.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case9_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case9_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case9_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/orc_s3_case9_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/orc_s3_case9_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/orc_s3_case9_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/orc_s3_case9_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case1_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case1_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case1_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case1_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case1_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case1_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case1_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case1_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case2_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case2_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case2_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case2_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case2_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case2_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case2_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case2_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case3_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case3_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case3_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case3_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case3_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case3_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case3_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case3_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case4_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case4_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case4_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case4_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case4_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case4_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case4_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case4_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case5_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case5_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case5_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case5_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case5_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case5_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case5_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case5_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case6_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case6_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case6_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case6_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case6_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case6_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case6_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case6_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case7_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case7_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case7_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case7_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case7_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case7_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case7_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case7_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case8_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case8_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case8_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case8_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case8_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case8_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case8_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case8_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case9_create.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case9_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case9_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case9_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case9_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case9_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/parquet_s3_case9_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/parquet_s3_case9_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/part_create.sql b/regression-test/suites/load_p2/broker_load/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/part_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/part_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/part_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/part_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/part_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/part_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/path_column_create.sql b/regression-test/suites/load_p2/broker_load/ddl/path_column_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/path_column_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/path_column_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/path_column_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/path_column_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/path_column_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/path_column_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/reverse_create.sql b/regression-test/suites/load_p2/broker_load/ddl/reverse_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/reverse_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/reverse_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/reverse_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/reverse_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/reverse_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/reverse_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set1_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set1_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set1_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set1_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set1_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set1_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set1_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set1_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set2_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set2_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set2_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set2_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set2_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set2_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set2_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set2_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set3_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set3_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set3_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set3_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set3_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set3_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set3_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set3_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set4_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set4_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set4_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set4_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set4_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set4_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set4_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set4_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set5_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set5_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set5_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set5_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set5_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set5_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set5_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set5_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set6_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set6_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set6_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set6_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set6_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set6_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set6_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set6_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set7_create.sql b/regression-test/suites/load_p2/broker_load/ddl/set7_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set7_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set7_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/set7_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/set7_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/set7_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/set7_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/upper_case_create.sql b/regression-test/suites/load_p2/broker_load/ddl/upper_case_create.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/upper_case_create.sql
rename to regression-test/suites/load_p2/broker_load/ddl/upper_case_create.sql
diff --git a/regression-test/suites/load_p0/broker_load/ddl/upper_case_drop.sql b/regression-test/suites/load_p2/broker_load/ddl/upper_case_drop.sql
similarity index 100%
rename from regression-test/suites/load_p0/broker_load/ddl/upper_case_drop.sql
rename to regression-test/suites/load_p2/broker_load/ddl/upper_case_drop.sql
diff --git a/regression-test/suites/load_p0/broker_load/test_broker_load.groovy b/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
similarity index 91%
rename from regression-test/suites/load_p0/broker_load/test_broker_load.groovy
rename to regression-test/suites/load_p2/broker_load/test_broker_load.groovy
index 09004d388b..15a28dc827 100644
--- a/regression-test/suites/load_p0/broker_load/test_broker_load.groovy
+++ b/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_broker_load", "p0") {
+suite("test_broker_load_p2", "p2") {
def tables = ["part",
"upper_case",
@@ -49,37 +49,37 @@ suite("test_broker_load", "p0") {
"orc_s3_case8", // table column uppercase * load column uppercase * orc file uppercase
"orc_s3_case9", // table column uppercase * load column lowercase * orc file uppercase
]
- def paths = ["s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/path/*/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/random_all_types/part*",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_100k_rows.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
- "s3://doris-build-hk-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
+ def paths = ["s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/path/*/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/part*",
+ "s3://doris-build-1308700295/regression/load/data/random_all_types/part*",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_100k_rows.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_lowercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
+ "s3://doris-build-1308700295/regression/load/data/orc/hits_10k_rows_uppercase.orc",
]
def columns_list = ["""p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment""",
"""p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment""",
@@ -155,7 +155,7 @@ suite("test_broker_load", "p0") {
"",
"",
"",
- "",
+ ""
]
def where_exprs = ["", "", "", "", "", "", "", "", "", "", "", "where p_partkey>10", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]
@@ -206,11 +206,10 @@ suite("test_broker_load", "p0") {
"",
"",
"",
- "type:LOAD_RUN_FAIL; msg:errCode = 2, detailMessage = [INTERNAL_ERROR]failed to find default value expr for slot: x1",
- "",
+ "[INTERNAL_ERROR]failed to find default value expr for slot: x1",
"",
- "type:LOAD_RUN_FAIL; msg:errCode = 2, detailMessage = [INTERNAL_ERROR]failed to find default value expr for slot: x1",
"",
+ "[INTERNAL_ERROR]failed to find default value expr for slot: x1",
"",
"",
"",
@@ -247,8 +246,8 @@ suite("test_broker_load", "p0") {
WITH S3 (
"AWS_ACCESS_KEY" = "$ak",
"AWS_SECRET_KEY" = "$sk",
- "AWS_ENDPOINT" = "cos.ap-hongkong.myqcloud.com",
- "AWS_REGION" = "ap-hongkong"
+ "AWS_ENDPOINT" = "cos.ap-beijing.myqcloud.com",
+ "AWS_REGION" = "ap-beijing"
)
properties(
"use_new_load_scan_node" = "true"
@@ -283,7 +282,7 @@ suite("test_broker_load", "p0") {
break;
}
if (result[0][2].equals("CANCELLED")) {
- assertTrue(error_msg[i] == result[0][7], "expected: " + error_msg[i] + ", actual: " + result[0][7] + ", label: $label")
+ assertTrue(result[0][7].contains(error_msg[i]))
break;
}
Thread.sleep(1000)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org