From 86d77084a42a96303600fa07c4b98fd447cafe2e Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Fri, 2 Jun 2023 10:40:07 +0800
Subject: [PATCH] [Fix](multi-catalog) fix oss access issue with aws s3 sdk
 (#20287)

---
 be/src/io/fs/s3_file_reader.cpp | 3 +++
 be/src/io/fs/s3_file_writer.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/be/src/io/fs/s3_file_reader.cpp b/be/src/io/fs/s3_file_reader.cpp
index 552fe473b5..2403b2497e 100644
--- a/be/src/io/fs/s3_file_reader.cpp
+++ b/be/src/io/fs/s3_file_reader.cpp
@@ -17,6 +17,7 @@
 
 #include "io/fs/s3_file_reader.h"
 
+#include <aws/core/http/URI.h>
 #include <aws/core/utils/Outcome.h>
 #include <aws/s3/S3Client.h>
 #include <aws/s3/S3Errors.h>
@@ -52,6 +53,8 @@ S3FileReader::S3FileReader(Path path, size_t file_size, std::string key, std::st
     DorisMetrics::instance()->s3_file_reader_total->increment(1);
     s3_file_reader_total << 1;
     s3_file_being_read << 1;
+
+    Aws::Http::SetCompliantRfc3986Encoding(true);
 }
 
 S3FileReader::~S3FileReader() {
diff --git a/be/src/io/fs/s3_file_writer.cpp b/be/src/io/fs/s3_file_writer.cpp
index 19dea1208f..4b70aaf344 100644
--- a/be/src/io/fs/s3_file_writer.cpp
+++ b/be/src/io/fs/s3_file_writer.cpp
@@ -18,6 +18,7 @@
 #include "io/fs/s3_file_writer.h"
 
 #include <aws/core/http/HttpResponse.h>
+#include <aws/core/http/URI.h>
 #include <aws/core/utils/Array.h>
 #include <aws/core/utils/HashingUtils.h>
 #include <aws/core/utils/Outcome.h>
@@ -85,6 +86,8 @@ S3FileWriter::S3FileWriter(Path path, std::shared_ptr<S3Client> client, const S3
           _client(std::move(client)) {
     s3_file_writer_total << 1;
     s3_file_being_written << 1;
+
+    Aws::Http::SetCompliantRfc3986Encoding(true);
 }
 
 S3FileWriter::~S3FileWriter() {