This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 21d6f414928 [fix](regresion-test) Fix the problem of occasional
failure of test_outfile_exception regression-test case (#24937)
21d6f414928 is described below
commit 21d6f4149288a13adbdaf6b71056b1a0435e680f
Author: Tiewei Fang <43782773+bepppo...@users.noreply.github.com>
AuthorDate: Thu Sep 28 10:05:43 2023 +0800
[fix](regresion-test) Fix the problem of occasional failure of
test_outfile_exception regression-test case (#24937)
---
.../suites/export_p0/test_outfile_exception.groovy | 36 +++++++++++++---------
.../outfile/test_outfile_exception.groovy | 35 ++++++++++++---------
2 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/regression-test/suites/export_p0/test_outfile_exception.groovy
b/regression-test/suites/export_p0/test_outfile_exception.groovy
index 86d5672ec78..74c53bcf664 100644
--- a/regression-test/suites/export_p0/test_outfile_exception.groovy
+++ b/regression-test/suites/export_p0/test_outfile_exception.groovy
@@ -22,6 +22,12 @@ import java.nio.file.Files
import java.nio.file.Paths
suite("test_outfile_exception") {
+
+ String s3_endpoint = getS3Endpoint()
+ String region = getS3Region()
+
+ // This is a bucket that doesn't exist
+ String bucket = "test-outfile-exception-no-exists"
def tableName = "outfile_exception_test"
sql """ DROP TABLE IF EXISTS ${tableName} """
@@ -67,11 +73,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as parquet
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -86,11 +92,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as orc
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -105,11 +111,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -124,11 +130,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv_with_names
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -143,11 +149,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv_with_names_and_types
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
diff --git
a/regression-test/suites/nereids_p0/outfile/test_outfile_exception.groovy
b/regression-test/suites/nereids_p0/outfile/test_outfile_exception.groovy
index fdba0916b6d..85a5d184b23 100644
--- a/regression-test/suites/nereids_p0/outfile/test_outfile_exception.groovy
+++ b/regression-test/suites/nereids_p0/outfile/test_outfile_exception.groovy
@@ -24,6 +24,11 @@ import java.nio.file.Paths
suite("test_outfile_exception") {
sql 'set enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
+
+ String s3_endpoint = getS3Endpoint()
+ String region = getS3Region()
+ // This is a bucket that doesn't exist
+ String bucket = "test-outfile-exception-no-exists"
def tableName = "outfile_exception_test"
sql """ DROP TABLE IF EXISTS ${tableName} """
@@ -69,11 +74,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as parquet
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -88,11 +93,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as orc
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -107,11 +112,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -126,11 +131,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv_with_names
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
@@ -145,11 +150,11 @@ suite("test_outfile_exception") {
test {
sql """
select * from ${tableName} t ORDER BY user_id
- into outfile "s3://ftw-datalake-test/test_outfile/exp_"
+ into outfile "s3://${bucket}/test_outfile/exp_"
format as csv_with_names_and_types
properties(
- "s3.endpoint" = "https://cos.ap-beijing.myqcloud.com";,
- "s3.region" = "ap-beijing",
+ "s3.endpoint" = "${s3_endpoint}",
+ "s3.region" = "${region}",
"s3.access_key"= "xx",
"s3.secret_key" = "yy"
);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
