This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 14550246459 branch-3.1: [fix](test) Fix two regression test #54433
(#54474)
14550246459 is described below
commit 1455024645903c7128b7c4313d4a6bd4892f0ca6
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Aug 8 14:04:43 2025 +0800
branch-3.1: [fix](test) Fix two regression test #54433 (#54474)
Cherry-picked from #54433
Co-authored-by: Lei Zhang <[email protected]>
---
docker/runtime/doris-compose/database.py | 3 ++-
.../query/test_nestedtypes_json_insert_into_with_s3.groovy | 10 ++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/docker/runtime/doris-compose/database.py
b/docker/runtime/doris-compose/database.py
index f46635033b8..0700d1aa7eb 100644
--- a/docker/runtime/doris-compose/database.py
+++ b/docker/runtime/doris-compose/database.py
@@ -183,7 +183,8 @@ class DBManager(object):
"s3.bucket" = "{cloud_store_config['DORIS_CLOUD_BUCKET']}",
"s3.region" = "{cloud_store_config['DORIS_CLOUD_REGION']}",
"s3.root.path" = "{str(uuid.uuid4())}",
- "provider" = "{cloud_store_config['DORIS_CLOUD_PROVIDER']}"
+ "provider" = "{cloud_store_config['DORIS_CLOUD_PROVIDER']}",
+ "use_path_style" = "false"
);
"""
# create hk storage vault from beijing cost 14s
diff --git
a/regression-test/suites/datatype_p0/nested_types/query/test_nestedtypes_json_insert_into_with_s3.groovy
b/regression-test/suites/datatype_p0/nested_types/query/test_nestedtypes_json_insert_into_with_s3.groovy
index 2d4aa6e2639..e3bedf65a2c 100644
---
a/regression-test/suites/datatype_p0/nested_types/query/test_nestedtypes_json_insert_into_with_s3.groovy
+++
b/regression-test/suites/datatype_p0/nested_types/query/test_nestedtypes_json_insert_into_with_s3.groovy
@@ -30,8 +30,10 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
String s3_endpoint = getS3Endpoint()
String bucket = context.config.otherConfigs.get("s3BucketName");
-
- def dataFilePath =
"https://"+"${bucket}"+"."+"${s3_endpoint}"+"/regression/datalake";
+ def dataFilePath = "s3://${bucket}/regression/datalake"
+ if (!s3_endpoint.startsWith("https://";) &&
!s3_endpoint.startsWith("http://";)) {
+ s3_endpoint = "https://${s3_endpoint}";
+ }
ArrayList<String> json_files = ["${dataFilePath}/as.json",
"${dataFilePath}/aa.json",
"${dataFilePath}/ms.json","${dataFilePath}/am.json",
@@ -202,6 +204,7 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
for (int i = 0; i < 3; ++i) {
qt_sql_arr_json_without_quote_s3 """
select * from s3("uri" = "${json_files[i]}",
+ "s3.endpoint" = "${s3_endpoint}",
"s3.access_key"= "${ak}",
"s3.secret_key" = "${sk}",
"format" = "json",
@@ -211,6 +214,7 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
sql """
insert into ${table_names[i]} select * from s3("uri" =
"${json_files[i]}",
+ "s3.endpoint" = "${s3_endpoint}",
"s3.access_key"= "${ak}",
"s3.secret_key" = "${sk}",
"format" = "json",
@@ -228,6 +232,7 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
qt_sql_arr_json_without_quote_s3 """
select * from s3(
"uri" = "${json_files[i]}",
+ "s3.endpoint" = "${s3_endpoint}",
"s3.access_key"= "${ak}",
"s3.secret_key" = "${sk}",
"format" = "json",
@@ -238,6 +243,7 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
sql """
insert into ${table_names[i]} select * from s3 (
"uri" = "${json_files[i]}",
+ "s3.endpoint" = "${s3_endpoint}",
"s3.access_key"= "${ak}",
"s3.secret_key" = "${sk}",
"format" = "json",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
