This is an automated email from the ASF dual-hosted git repository. yiguolei 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 d4956bfaf5d do not use path style to access s3 (#35788) d4956bfaf5d is described below commit d4956bfaf5d3ff69542cef2992148d82078b2d68 Author: Thearas <thearas...@gmail.com> AuthorDate: Mon Jun 3 13:57:13 2024 +0800 do not use path style to access s3 (#35788) ## Proposed changes --- .../export_p0/export/test_show_export.groovy | 4 +-- .../outfile/csv/test_outfile_csv_array_type.groovy | 28 ++++++++--------- .../csv/test_outfile_csv_complex_type.groovy | 14 ++++----- .../outfile/csv/test_outfile_csv_map_type.groovy | 36 +++++++++++----------- .../csv/test_outfile_csv_one_nested_type.groovy | 26 ++++++++-------- .../outfile/csv/test_outfile_empty_data.groovy | 4 +-- .../orc/test_outfile_orc_one_nested_type.groovy | 26 ++++++++-------- .../outfile/orc/test_outfile_orc_timestamp.groovy | 2 +- .../test_outfile_expr_generate_col_name.groovy | 4 +-- .../parquet/test_outfile_parquet_array_type.groovy | 28 ++++++++--------- .../test_outfile_parquet_complex_type.groovy | 14 ++++----- .../parquet/test_outfile_parquet_map_type.groovy | 36 +++++++++++----------- .../test_outfile_parquet_one_nested_type.groovy | 24 +++++++-------- .../suites/export_p0/test_export_data_types.groovy | 10 +++--- .../suites/export_p0/test_export_orc.groovy | 2 +- .../suites/export_p0/test_export_parquet.groovy | 2 +- .../suites/export_p0/test_export_view.groovy | 2 +- .../export_p0/test_outfile_file_suffix.groovy | 4 +-- .../export_p0/test_outfile_orc_array_type.groovy | 28 ++++++++--------- .../export_p0/test_outfile_orc_complex_type.groovy | 14 ++++----- .../export_p0/test_outfile_orc_map_type.groovy | 36 +++++++++++----------- .../suites/export_p0/test_with_bom.groovy | 8 ++--- .../export_p2/test_export_with_parallelism.groovy | 4 +-- .../suites/export_p2/test_export_with_s3.groovy | 2 +- .../test_insert_from_tvf_with_common_user.groovy | 2 +- .../external_table_p0/tvf/test_s3_tvf.groovy | 6 ++-- .../tvf/test_s3_tvf_compression.groovy | 20 ++++++------ .../tvf/test_s3_tvf_with_resource.groovy | 8 ++--- .../tvf/test_path_partition_keys.groovy | 8 ++--- .../suites/load_p0/tvf/test_tvf_error_url.groovy | 8 ++--- 30 files changed, 205 insertions(+), 205 deletions(-) diff --git a/regression-test/suites/export_p0/export/test_show_export.groovy b/regression-test/suites/export_p0/export/test_show_export.groovy index 2bb10b6a748..b45b6400956 100644 --- a/regression-test/suites/export_p0/export/test_show_export.groovy +++ b/regression-test/suites/export_p0/export/test_show_export.groovy @@ -119,7 +119,7 @@ suite("test_show_export", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "parquet", @@ -154,7 +154,7 @@ suite("test_show_export", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy index 14e50077d08..736da0719f9 100644 --- a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy +++ b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy @@ -93,7 +93,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -126,7 +126,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -158,7 +158,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_date """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -190,7 +190,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_datetime """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -225,7 +225,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_varchar """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -259,7 +259,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_smallint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -292,7 +292,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_tinyint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -325,7 +325,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_boolean """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -358,7 +358,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_bigint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -390,7 +390,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_largeint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -423,7 +423,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_float """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -455,7 +455,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_double """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -487,7 +487,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_CHAR """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -520,7 +520,7 @@ suite("test_outfile_csv_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_decimal """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy index cbe3253ebaf..c458f34a0d3 100644 --- a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy +++ b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy @@ -94,7 +94,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -128,7 +128,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -160,7 +160,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -190,7 +190,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -226,7 +226,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -258,7 +258,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -299,7 +299,7 @@ suite("test_outfile_csv_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy index 92e0b89916b..5058ef4ad1d 100644 --- a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy +++ b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy @@ -92,7 +92,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -128,7 +128,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -164,7 +164,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -199,7 +199,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -237,7 +237,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -273,7 +273,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -308,7 +308,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -343,7 +343,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -379,7 +379,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -415,7 +415,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -450,7 +450,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -485,7 +485,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -520,7 +520,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load13 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -555,7 +555,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load14 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -592,7 +592,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load15 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -629,7 +629,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load16 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -665,7 +665,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load17 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -701,7 +701,7 @@ suite("test_outfile_csv_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load18 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_one_nested_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_one_nested_type.groovy index 783f6c126dd..9eaa00db538 100644 --- a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_one_nested_type.groovy +++ b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_one_nested_type.groovy @@ -88,7 +88,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -118,7 +118,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -152,7 +152,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -185,7 +185,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -219,7 +219,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -251,7 +251,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -283,7 +283,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -316,7 +316,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -347,7 +347,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -375,7 +375,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -405,7 +405,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -435,7 +435,7 @@ suite("test_outfile_csv_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -444,4 +444,4 @@ suite("test_outfile_csv_one_nested_type", "p0") { """ } finally { } -} \ No newline at end of file +} diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_empty_data.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_empty_data.groovy index 75359e8ff47..d8da398ea81 100644 --- a/regression-test/suites/export_p0/outfile/csv/test_outfile_empty_data.groovy +++ b/regression-test/suites/export_p0/outfile/csv/test_outfile_empty_data.groovy @@ -152,12 +152,12 @@ suite("test_outfile_empty_data", "external,hive,tvf,external_docker") { """ qt_select_tvf3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_to_s3_directly_url.substring(4, outfile_to_s3_directly_url.length())}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_to_s3_directly_url.substring(5 + bucket.length(), outfile_to_s3_directly_url.length())}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${format}", "region" = "${region}", - "use_path_style" = "true" + "use_path_style" = "false" -- aliyun does not support path_style ); """ diff --git a/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_one_nested_type.groovy b/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_one_nested_type.groovy index 96809c98c98..8103c570f7c 100644 --- a/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_one_nested_type.groovy +++ b/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_one_nested_type.groovy @@ -88,7 +88,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -118,7 +118,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -152,7 +152,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -185,7 +185,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -219,7 +219,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -251,7 +251,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -283,7 +283,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -316,7 +316,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -347,7 +347,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -375,7 +375,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -405,7 +405,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -435,7 +435,7 @@ suite("test_outfile_orc_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -444,4 +444,4 @@ suite("test_outfile_orc_one_nested_type", "p0") { """ } finally { } -} \ No newline at end of file +} diff --git a/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy b/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy index 3b5ecc50d76..28fde69a2ab 100644 --- a/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy +++ b/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy @@ -97,7 +97,7 @@ suite("test_outfile_orc_timestamp", "p0") { def outfile_url = outfile_to_S3() qt_select_tvf1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", diff --git a/regression-test/suites/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.groovy b/regression-test/suites/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.groovy index 1d3d8df2ba8..e5a9ec7ea49 100644 --- a/regression-test/suites/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.groovy +++ b/regression-test/suites/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.groovy @@ -94,7 +94,7 @@ suite("test_outfile_expr_generate_col_name", "p0") { def check_outfile_data = { outfile_url, outfile_format -> order_qt_select_tvf """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -105,7 +105,7 @@ suite("test_outfile_expr_generate_col_name", "p0") { def check_outfile_column_name = { outfile_url, outfile_format -> order_qt_desc_s3 """ Desc function S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", diff --git a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_array_type.groovy b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_array_type.groovy index cd75b0f4978..75e0853f4cb 100644 --- a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_array_type.groovy +++ b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_array_type.groovy @@ -93,7 +93,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -126,7 +126,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -158,7 +158,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_date """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -190,7 +190,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_datetime """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -225,7 +225,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_varchar """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -259,7 +259,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_smallint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -292,7 +292,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_tinyint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -325,7 +325,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_boolean """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -358,7 +358,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_bigint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -390,7 +390,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_largeint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -423,7 +423,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_float """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -455,7 +455,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_double """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -487,7 +487,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_CHAR """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -520,7 +520,7 @@ suite("test_outfile_parquet_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_decimal """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_complex_type.groovy b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_complex_type.groovy index 66867cb75d3..6452576d8ff 100644 --- a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_complex_type.groovy +++ b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_complex_type.groovy @@ -94,7 +94,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -128,7 +128,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -160,7 +160,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -190,7 +190,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -226,7 +226,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -258,7 +258,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -299,7 +299,7 @@ suite("test_outfile_parquet_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_map_type.groovy b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_map_type.groovy index 36e7ed2bd28..31592967e2b 100644 --- a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_map_type.groovy +++ b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_map_type.groovy @@ -88,7 +88,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -122,7 +122,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -156,7 +156,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -189,7 +189,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -224,7 +224,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -257,7 +257,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -289,7 +289,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -321,7 +321,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -354,7 +354,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -388,7 +388,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -420,7 +420,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -452,7 +452,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -484,7 +484,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load13 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -516,7 +516,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load14 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -550,7 +550,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load15 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -584,7 +584,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load16 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -617,7 +617,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load17 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", @@ -651,7 +651,7 @@ suite("test_outfile_parquet_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load18 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_one_nested_type.groovy b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_one_nested_type.groovy index 23153d69a8d..30a27e64853 100644 --- a/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_one_nested_type.groovy +++ b/regression-test/suites/export_p0/outfile/parquet/test_outfile_parquet_one_nested_type.groovy @@ -88,7 +88,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -118,7 +118,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -152,7 +152,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -185,7 +185,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -219,7 +219,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -251,7 +251,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -283,7 +283,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -316,7 +316,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -347,7 +347,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -375,7 +375,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -405,7 +405,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", @@ -435,7 +435,7 @@ suite("test_outfile_parquet_one_nested_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${outfile_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${outfile_format}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${outfile_format}", diff --git a/regression-test/suites/export_p0/test_export_data_types.groovy b/regression-test/suites/export_p0/test_export_data_types.groovy index c45a4391b62..babf8c5cc40 100644 --- a/regression-test/suites/export_p0/test_export_data_types.groovy +++ b/regression-test/suites/export_p0/test_export_data_types.groovy @@ -156,7 +156,7 @@ suite("test_export_data_types", "p0") { def outfile_url = waiting_export.call(label) qt_select_load1 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", @@ -189,7 +189,7 @@ suite("test_export_data_types", "p0") { def outfile_url = waiting_export.call(label) qt_select_load2 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", @@ -221,7 +221,7 @@ suite("test_export_data_types", "p0") { def outfile_url = waiting_export.call(label) qt_select_load3 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", @@ -253,7 +253,7 @@ suite("test_export_data_types", "p0") { def outfile_url = waiting_export.call(label) qt_select_load4 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", @@ -286,7 +286,7 @@ suite("test_export_data_types", "p0") { def outfile_url = waiting_export.call(label) qt_select_load5 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", diff --git a/regression-test/suites/export_p0/test_export_orc.groovy b/regression-test/suites/export_p0/test_export_orc.groovy index 6353b549025..c0a7b454478 100644 --- a/regression-test/suites/export_p0/test_export_orc.groovy +++ b/regression-test/suites/export_p0/test_export_orc.groovy @@ -118,7 +118,7 @@ suite("test_export_orc", "p0") { def outfile_url = waiting_export.call(label) qt_select_load1 """ SELECT * FROM s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", diff --git a/regression-test/suites/export_p0/test_export_parquet.groovy b/regression-test/suites/export_p0/test_export_parquet.groovy index 71506e7efe6..f7b1ff858e8 100644 --- a/regression-test/suites/export_p0/test_export_parquet.groovy +++ b/regression-test/suites/export_p0/test_export_parquet.groovy @@ -120,7 +120,7 @@ suite("test_export_parquet", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/test_export_view.groovy b/regression-test/suites/export_p0/test_export_view.groovy index 4ef4bdfbf92..2a2b06addcb 100644 --- a/regression-test/suites/export_p0/test_export_view.groovy +++ b/regression-test/suites/export_p0/test_export_view.groovy @@ -633,7 +633,7 @@ suite("test_export_view", "p0") { } order_qt_select_load7 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.parquet", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.parquet", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "parquet", diff --git a/regression-test/suites/export_p0/test_outfile_file_suffix.groovy b/regression-test/suites/export_p0/test_outfile_file_suffix.groovy index 9dbf9163c30..0123b6ee4cf 100644 --- a/regression-test/suites/export_p0/test_outfile_file_suffix.groovy +++ b/regression-test/suites/export_p0/test_outfile_file_suffix.groovy @@ -60,9 +60,9 @@ suite("test_outfile_file_suffix", "p0") { def file_suffix = "txt"; def file_format = "csv"; def outfile_url = csv_suffix_result(file_suffix, file_format); - print("http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_suffix}") + print("http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_suffix}") qt_select """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_suffix}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_suffix}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${file_format}", diff --git a/regression-test/suites/export_p0/test_outfile_orc_array_type.groovy b/regression-test/suites/export_p0/test_outfile_orc_array_type.groovy index 51494e816be..ddb95099e29 100644 --- a/regression-test/suites/export_p0/test_outfile_orc_array_type.groovy +++ b/regression-test/suites/export_p0/test_outfile_orc_array_type.groovy @@ -93,7 +93,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -126,7 +126,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -158,7 +158,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_date """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -190,7 +190,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_datetime """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -225,7 +225,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_varchar """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -259,7 +259,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_smallint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -292,7 +292,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_tinyint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -325,7 +325,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_boolean """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -358,7 +358,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_bigint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -390,7 +390,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_largeint """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -423,7 +423,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_float """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -455,7 +455,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_double """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -487,7 +487,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_CHAR """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -520,7 +520,7 @@ suite("test_outfile_orc_array_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load_decimal """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", diff --git a/regression-test/suites/export_p0/test_outfile_orc_complex_type.groovy b/regression-test/suites/export_p0/test_outfile_orc_complex_type.groovy index 959283350d0..d7834ef4fb8 100644 --- a/regression-test/suites/export_p0/test_outfile_orc_complex_type.groovy +++ b/regression-test/suites/export_p0/test_outfile_orc_complex_type.groovy @@ -94,7 +94,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -128,7 +128,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -160,7 +160,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -190,7 +190,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -226,7 +226,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -258,7 +258,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -299,7 +299,7 @@ suite("test_outfile_orc_complex_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", diff --git a/regression-test/suites/export_p0/test_outfile_orc_map_type.groovy b/regression-test/suites/export_p0/test_outfile_orc_map_type.groovy index 7c7180b4630..9ae7074593f 100644 --- a/regression-test/suites/export_p0/test_outfile_orc_map_type.groovy +++ b/regression-test/suites/export_p0/test_outfile_orc_map_type.groovy @@ -92,7 +92,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -128,7 +128,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -164,7 +164,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -199,7 +199,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load4 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -237,7 +237,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load5 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -273,7 +273,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load6 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -308,7 +308,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load7 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -343,7 +343,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load8 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -379,7 +379,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load9 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -415,7 +415,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load10 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -450,7 +450,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load11 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -485,7 +485,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load12 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -520,7 +520,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load13 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -555,7 +555,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load14 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -592,7 +592,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load15 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -629,7 +629,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load16 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -665,7 +665,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load17 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -701,7 +701,7 @@ suite("test_outfile_orc_map_type", "p0") { def outfile_url = outfile_to_S3() qt_select_load18 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", diff --git a/regression-test/suites/export_p0/test_with_bom.groovy b/regression-test/suites/export_p0/test_with_bom.groovy index ede264f189e..97c4e1756cb 100644 --- a/regression-test/suites/export_p0/test_with_bom.groovy +++ b/regression-test/suites/export_p0/test_with_bom.groovy @@ -115,7 +115,7 @@ suite("test_with_bom", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "csv", @@ -152,7 +152,7 @@ suite("test_with_bom", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "csv", @@ -189,7 +189,7 @@ suite("test_with_bom", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "csv_with_names", @@ -226,7 +226,7 @@ suite("test_with_bom", "p0") { def outfile_url = waiting_export.call(label) order_qt_select_load1 """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.${file_format}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.${file_format}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "csv_with_names_and_types", diff --git a/regression-test/suites/export_p2/test_export_with_parallelism.groovy b/regression-test/suites/export_p2/test_export_with_parallelism.groovy index c479f1fb011..f73010d8336 100644 --- a/regression-test/suites/export_p2/test_export_with_parallelism.groovy +++ b/regression-test/suites/export_p2/test_export_with_parallelism.groovy @@ -128,12 +128,12 @@ suite("test_export_with_parallelism", "p2") { // check data correctness sql """ insert into ${table_load_name} select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url_list.get(j).substring(4)}.${file_suffix}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url_list.substring(5 + bucket.length())}.${file_suffix}", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "${format}", "region" = "${region}", - "use_path_style" = "true" + "use_path_style" = "false" -- aliyun does not support path_style ); """ } diff --git a/regression-test/suites/export_p2/test_export_with_s3.groovy b/regression-test/suites/export_p2/test_export_with_s3.groovy index 1d505f9c5d4..5921241316e 100644 --- a/regression-test/suites/export_p2/test_export_with_s3.groovy +++ b/regression-test/suites/export_p2/test_export_with_s3.groovy @@ -104,7 +104,7 @@ suite("test_export_with_s3", "p2") { // check data correctness order_qt_select """ select * from s3( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.${file_suffix}", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length())}0.${file_suffix}", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "${format}", diff --git a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy index 1d76ee15f36..441e05f6ef5 100644 --- a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy @@ -93,7 +93,7 @@ suite("test_insert_from_tvf_with_common_user", "p0") { sql """ INSERT INTO ${load_table_name} SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy index 24dda4196d7..67dc94d32d0 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy @@ -79,7 +79,7 @@ suite("test_s3_tvf", "p0") { // 1. normal try { order_qt_select_1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "orc", @@ -107,11 +107,11 @@ suite("test_s3_tvf", "p0") { // 3.test use_path_style try { order_qt_select_3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "s3.access_key"= "${ak}", "s3.secret_key" = "${sk}", "format" = "orc", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "region" = "${region}" ); """ diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy index 5eb63c94ddc..2975f4f0cc9 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy @@ -35,7 +35,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}") order by c1,c2,c3,c4,c5 limit 20; """ @@ -49,7 +49,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}") order by cast(c1 as int),c4 limit 20; """ @@ -65,7 +65,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}") order by c1,c2,c3,c4,c5 limit 15; """ @@ -79,7 +79,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}") where c1!="100" order by cast(c4 as date),c1 limit 13; """ @@ -95,7 +95,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}FRAME") order by c1,c2,c3,c4,c5 limit 14; """ @@ -109,7 +109,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}FRAME") where c3="buHDwfGeNHfpRFdNaogneddi" order by c3,c1 limit 14; """ @@ -126,7 +126,7 @@ suite("test_s3_tvf_compression", "p0") { "s3.secret_key" = "${sk}", "REGION" = "${region}", "FORMAT" = "csv", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "column_separator" = '\001', "compress_type" ="${compress_type}") ${orderBy_limit}; """ @@ -140,7 +140,7 @@ suite("test_s3_tvf_compression", "p0") { "REGION" = "${region}", "FORMAT" = "csv", "column_separator" = '\001', - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "compress_type" ="${compress_type}") group by c1,c2 order by c1,c2 limit 5; """ @@ -156,7 +156,7 @@ suite("test_s3_tvf_compression", "p0") { "s3.secret_key" = "${sk}", "REGION" = "${region}", "FORMAT" = "csv", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "column_separator" = '\001', "compress_type" ="${compress_type}block") ${orderBy_limit}; """ @@ -170,7 +170,7 @@ suite("test_s3_tvf_compression", "p0") { "s3.secret_key" = "${sk}", "REGION" = "${region}", "FORMAT" = "csv", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "column_separator" = '\001', "compress_type" ="${compress_type}block") where c2 ="abccc"; """ diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy index 0f5f43ccb8e..cc25c683f76 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy @@ -99,9 +99,9 @@ suite("test_s3_tvf_with_resource", "p0") { // 1. normal try { order_qt_select_1 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "format" = "orc", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "resource" = "${resource_name}" ); """ @@ -123,9 +123,9 @@ suite("test_s3_tvf_with_resource", "p0") { // 3.test use_path_style try { order_qt_select_3 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc", + "uri" = "http://${bucket}.${s3_endpoint}${outfile_url.substring(5 + bucket.length(), outfile_url.length() - 1)}0.orc", "format" = "orc", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "resource" = "${resource_name}" ); """ diff --git a/regression-test/suites/external_table_p2/tvf/test_path_partition_keys.groovy b/regression-test/suites/external_table_p2/tvf/test_path_partition_keys.groovy index a859d1efb9b..985ef5c6873 100644 --- a/regression-test/suites/external_table_p2/tvf/test_path_partition_keys.groovy +++ b/regression-test/suites/external_table_p2/tvf/test_path_partition_keys.groovy @@ -135,7 +135,7 @@ suite("test_path_partition_keys", "p2,external,tvf,external_remote,external_remo "s3.secret_key" = "${sk}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "path_partition_keys"="dt1") """ @@ -149,7 +149,7 @@ suite("test_path_partition_keys", "p2,external,tvf,external_remote,external_remo "s3.secret_key" = "${sk}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "path_partition_keys"="dt1") limit 3; """ @@ -162,7 +162,7 @@ suite("test_path_partition_keys", "p2,external,tvf,external_remote,external_remo "s3.secret_key" = "${sk}", "FORMAT" = "csv", "column_separator" = ",", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "path_partition_keys"="dt1") limit 3; """ @@ -174,7 +174,7 @@ suite("test_path_partition_keys", "p2,external,tvf,external_remote,external_remo "s3.access_key" = "${ak}", "s3.secret_key" = "${sk}", "FORMAT" = "csv", - "use_path_style" = "true", + "use_path_style" = "false", -- aliyun does not support path_style "column_separator" = ",", "path_partition_keys"="dt2,dt1") limit 3; """ diff --git a/regression-test/suites/load_p0/tvf/test_tvf_error_url.groovy b/regression-test/suites/load_p0/tvf/test_tvf_error_url.groovy index d1dcff4d530..f1b1df31ddf 100644 --- a/regression-test/suites/load_p0/tvf/test_tvf_error_url.groovy +++ b/regression-test/suites/load_p0/tvf/test_tvf_error_url.groovy @@ -24,7 +24,7 @@ suite("test_tvf_error_url", "p0") { String path = "select_tvf/no_exists_file_test" order_qt_select """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}/${bucket}/${path}/no_exist_file1.csv", + "uri" = "http://${bucket}.${s3_endpoint}/${path}/no_exist_file1.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -33,7 +33,7 @@ suite("test_tvf_error_url", "p0") { """ order_qt_desc """ desc function S3 ( - "uri" = "http://${s3_endpoint}/${bucket}/${path}/no_exist_file1.csv", + "uri" = "http://${bucket}.${s3_endpoint}/${path}/no_exist_file1.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -42,7 +42,7 @@ suite("test_tvf_error_url", "p0") { """ order_qt_select2 """ SELECT * FROM S3 ( - "uri" = "http://${s3_endpoint}/${bucket}/${path}/*.csv", + "uri" = "http://${bucket}.${s3_endpoint}/${path}/*.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", @@ -51,7 +51,7 @@ suite("test_tvf_error_url", "p0") { """ order_qt_desc2 """ desc function S3 ( - "uri" = "http://${s3_endpoint}/${bucket}/${path}/*.csv", + "uri" = "http://${bucket}.${s3_endpoint}/${path}/*.csv", "ACCESS_KEY"= "${ak}", "SECRET_KEY" = "${sk}", "format" = "csv", --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org