This is an automated email from the ASF dual-hosted git repository.
liaoxin pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new d7cae940d2b [fix](test) fix case conflict between
test_tvf_based_broker_load and test_broker_load #37622 (#37631)
d7cae940d2b is described below
commit d7cae940d2bb3235e8e6ab23d0ccd145b0c7c97a
Author: Xin Liao <[email protected]>
AuthorDate: Thu Jul 11 17:52:21 2024 +0800
[fix](test) fix case conflict between test_tvf_based_broker_load and
test_broker_load #37622 (#37631)
cherry pick from #37622
---
.../broker_load/tvf/test_tvf_based_broker_load.out | 16 ++++++++++++++++
.../{ => tvf}/test_tvf_based_broker_load.groovy | 8 ++++----
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git
a/regression-test/data/load_p2/broker_load/tvf/test_tvf_based_broker_load.out
b/regression-test/data/load_p2/broker_load/tvf/test_tvf_based_broker_load.out
new file mode 100644
index 00000000000..c553fea0bcc
--- /dev/null
+++
b/regression-test/data/load_p2/broker_load/tvf/test_tvf_based_broker_load.out
@@ -0,0 +1,16 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !parquet_s3_case1 --
+200000
+
+-- !parquet_s3_case3 --
+99999
+
+-- !parquet_s3_case6 --
+99999
+
+-- !parquet_s3_case7 --
+200000
+
+-- !parquet_s3_case8 --
+200000
+
diff --git
a/regression-test/suites/load_p2/broker_load/test_tvf_based_broker_load.groovy
b/regression-test/suites/load_p2/broker_load/tvf/test_tvf_based_broker_load.groovy
similarity index 99%
rename from
regression-test/suites/load_p2/broker_load/test_tvf_based_broker_load.groovy
rename to
regression-test/suites/load_p2/broker_load/tvf/test_tvf_based_broker_load.groovy
index 857ebe73ad5..dffc2acf49c 100644
---
a/regression-test/suites/load_p2/broker_load/test_tvf_based_broker_load.groovy
+++
b/regression-test/suites/load_p2/broker_load/tvf/test_tvf_based_broker_load.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_tvf_based_broker_load_p2", "p2") {
+suite("test_tvf_based_broker_load", "p2") {
def tables = ["part",
"upper_case",
@@ -249,8 +249,8 @@ suite("test_tvf_based_broker_load_p2", "p2") {
try {
def i = 0
for (String table in tables) {
- sql new
File("""${context.file.parent}/ddl/${table}_drop.sql""").text
- sql new
File("""${context.file.parent}/ddl/${table}_create.sql""").text
+ sql new
File("""${context.file.parent}/../ddl/${table}_drop.sql""").text
+ sql new
File("""${context.file.parent}/../ddl/${table}_create.sql""").text
def uuid = UUID.randomUUID().toString().replace("-", "0")
uuids.add(uuid)
do_load_job.call(uuid, paths[i], table, columns_list[i],
column_in_paths[i], preceding_filters[i],
@@ -304,7 +304,7 @@ suite("test_tvf_based_broker_load_p2", "p2") {
} finally {
for (String table in tables) {
- sql new
File("""${context.file.parent}/ddl/${table}_drop.sql""").text
+ sql new
File("""${context.file.parent}/../ddl/${table}_drop.sql""").text
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
