From d53cb3fb48ef5bc7bf8a9068934703f99b033532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E9=97=AF?= Date: Wed, 16 Oct 2024 14:31:31 +0000 Subject: [PATCH] Merge branch 'cherry-pick-commit-b6e281f1-1' into 'cnch-dev' fix(clickhousech@m-3986737683): [cp] fix s3 input config parse See merge request dp/ClickHouse!25790 --- src/FormaterTool/PartToolkitBase.cpp | 1 + src/FormaterTool/PartWriter.cpp | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/FormaterTool/PartToolkitBase.cpp b/src/FormaterTool/PartToolkitBase.cpp index 564b031e8b..75c7323053 100644 --- a/src/FormaterTool/PartToolkitBase.cpp +++ b/src/FormaterTool/PartToolkitBase.cpp @@ -145,6 +145,7 @@ void PartToolkitBase::applySettings() settings.set("s3_ak_id", s3_input_config->ak_id); settings.set("s3_ak_secret", s3_input_config->ak_secret); settings.set("s3_region", s3_input_config->region); + settings.set("s3_use_virtual_hosted_style", s3_input_config->is_virtual_hosted_style); } } diff --git a/src/FormaterTool/PartWriter.cpp b/src/FormaterTool/PartWriter.cpp index 59340e644c..1444785608 100644 --- a/src/FormaterTool/PartWriter.cpp +++ b/src/FormaterTool/PartWriter.cpp @@ -112,13 +112,6 @@ PartWriter::PartWriter(const ASTPtr & query_ptr_, ContextMutablePtr context_) : if (!endsWith(dest_path, "/")) dest_path.append("/"); } - - if (s3_input_config) - { - // Overwrite S3 source_path as: - // `S3:////` - source_path = "s3://" + s3_input_config->bucket + "/" + s3_input_config->root_prefix + "/" + source_path; - } } PartWriter::~PartWriter()