This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 785af8c7252 branch-3.0: [Fix](vault) Remove double slashes when s3
vault prefix is empty #50352 (#50377)
785af8c7252 is described below
commit 785af8c7252c5ab32b7ef4cc0510b57a2fa572cf
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 24 19:42:49 2025 +0800
branch-3.0: [Fix](vault) Remove double slashes when s3 vault prefix is
empty #50352 (#50377)
Cherry-picked from #50352
Co-authored-by: abmdocrt <lianyuk...@selectdb.com>
---
cloud/src/recycler/s3_accessor.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/cloud/src/recycler/s3_accessor.cpp
b/cloud/src/recycler/s3_accessor.cpp
index 0c72e4a6921..b206dc62651 100644
--- a/cloud/src/recycler/s3_accessor.cpp
+++ b/cloud/src/recycler/s3_accessor.cpp
@@ -213,7 +213,7 @@ S3Accessor::S3Accessor(S3Conf conf)
S3Accessor::~S3Accessor() = default;
std::string S3Accessor::get_key(const std::string& relative_path) const {
- return conf_.prefix + '/' + relative_path;
+ return conf_.prefix.empty() ? relative_path : conf_.prefix + '/' +
relative_path;
}
std::string S3Accessor::to_uri(const std::string& relative_path) const {
@@ -277,7 +277,11 @@ int S3Accessor::init() {
#endif
}
default: {
- uri_ = conf_.endpoint + '/' + conf_.bucket + '/' + conf_.prefix;
+ if (conf_.prefix.empty()) {
+ uri_ = conf_.endpoint + '/' + conf_.bucket;
+ } else {
+ uri_ = conf_.endpoint + '/' + conf_.bucket + '/' + conf_.prefix;
+ }
static S3Environment s3_env;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
