This is an automated email from the ASF dual-hosted git repository.
morningman 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 a0f3c1cd1e6 [chore](Compile) Fix S3 file writer ut's compile error due
to miss cherry-pick (#36037)
a0f3c1cd1e6 is described below
commit a0f3c1cd1e6d8025634e2a1942c2c477b97cb621
Author: AlexYue <yj976240...@gmail.com>
AuthorDate: Sat Jun 8 22:21:20 2024 +0800
[chore](Compile) Fix S3 file writer ut's compile error due to miss
cherry-pick (#36037)
The S3 File Writer's ut can't pass ut compile, this pr tries to fix it.
---
be/test/io/fs/remote_file_system_test.cpp | 2 +-
be/test/io/fs/s3_file_writer_test.cpp | 4 ++--
be/test/olap/remote_rowset_gc_test.cpp | 6 +++---
be/test/olap/rowset/beta_rowset_test.cpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/be/test/io/fs/remote_file_system_test.cpp
b/be/test/io/fs/remote_file_system_test.cpp
index c5d80d1b65d..c496294f08f 100644
--- a/be/test/io/fs/remote_file_system_test.cpp
+++ b/be/test/io/fs/remote_file_system_test.cpp
@@ -420,7 +420,7 @@ TEST_F(RemoteFileSystemTest, TestS3FileSystem) {
CHECK_STATUS_OK(s3_uri.parse());
CHECK_STATUS_OK(S3ClientFactory::convert_properties_to_s3_conf(s3_prop,
s3_uri, &s3_conf));
std::shared_ptr<io::S3FileSystem> fs;
- CHECK_STATUS_OK(io::S3FileSystem::create(std::move(s3_conf), "", &fs));
+ CHECK_STATUS_OK(io::S3FileSystem::create(std::move(s3_conf), "", nullptr,
&fs));
// delete directory
io::Path delete_path = s3_location + "/tmp1";
diff --git a/be/test/io/fs/s3_file_writer_test.cpp
b/be/test/io/fs/s3_file_writer_test.cpp
index 5ff1cc5e48a..92ad11e8e63 100644
--- a/be/test/io/fs/s3_file_writer_test.cpp
+++ b/be/test/io/fs/s3_file_writer_test.cpp
@@ -56,8 +56,8 @@ public:
s3_conf.region = config::test_s3_region;
s3_conf.bucket = config::test_s3_bucket;
s3_conf.prefix = "s3_file_writer_test";
- static_cast<void>(
- io::S3FileSystem::create(std::move(s3_conf),
"s3_file_writer_test", &s3_fs));
+ static_cast<void>(io::S3FileSystem::create(std::move(s3_conf),
"s3_file_writer_test",
+ nullptr, &s3_fs));
std::cout << "s3 conf: " << s3_conf.to_string() << std::endl;
ASSERT_EQ(Status::OK(), s3_fs->connect());
diff --git a/be/test/olap/remote_rowset_gc_test.cpp
b/be/test/olap/remote_rowset_gc_test.cpp
index 6fb9a2eb54a..d0d53647c22 100644
--- a/be/test/olap/remote_rowset_gc_test.cpp
+++ b/be/test/olap/remote_rowset_gc_test.cpp
@@ -78,9 +78,9 @@ public:
s3_conf.bucket = config::test_s3_bucket;
s3_conf.prefix = "remote_rowset_gc_test";
std::shared_ptr<io::S3FileSystem> s3_fs;
- ASSERT_TRUE(
- io::S3FileSystem::create(std::move(s3_conf),
std::to_string(kResourceId), &s3_fs)
- .ok());
+ ASSERT_TRUE(io::S3FileSystem::create(std::move(s3_conf),
std::to_string(kResourceId),
+ nullptr, &s3_fs)
+ .ok());
put_storage_resource(kResourceId, {s3_fs, 1});
auto storage_policy = std::make_shared<StoragePolicy>();
storage_policy->name = "TabletCooldownTest";
diff --git a/be/test/olap/rowset/beta_rowset_test.cpp
b/be/test/olap/rowset/beta_rowset_test.cpp
index 7fa5ba378a7..34f6e96ae7b 100644
--- a/be/test/olap/rowset/beta_rowset_test.cpp
+++ b/be/test/olap/rowset/beta_rowset_test.cpp
@@ -256,7 +256,7 @@ TEST_F(BetaRowsetTest, ReadTest) {
s3_conf.prefix = "prefix";
std::string resource_id = "10000";
std::shared_ptr<io::S3FileSystem> fs;
- ASSERT_TRUE(io::S3FileSystem::create(std::move(s3_conf), resource_id,
&fs).ok());
+ ASSERT_TRUE(io::S3FileSystem::create(std::move(s3_conf), resource_id,
nullptr, &fs).ok());
// failed to head object
{
Aws::Auth::AWSCredentials aws_cred("ak", "sk");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
