This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0ccff250d9a [test](be) Add ut for class `AzureObjStorageClient`
(#47800)
0ccff250d9a is described below
commit 0ccff250d9afd0e02a29c649169679dc8435e061
Author: Lei Zhang <[email protected]>
AuthorDate: Tue Feb 25 23:08:01 2025 +0800
[test](be) Add ut for class `AzureObjStorageClient` (#47800)
---
be/src/io/fs/azure_obj_storage_client.cpp | 2 +-
be/test/io/fs/azure_obj_storage_client_test.cpp | 144 ++++++++++++++++++++++++
2 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/be/src/io/fs/azure_obj_storage_client.cpp
b/be/src/io/fs/azure_obj_storage_client.cpp
index 44d45077ebc..bf2e370da6f 100644
--- a/be/src/io/fs/azure_obj_storage_client.cpp
+++ b/be/src/io/fs/azure_obj_storage_client.cpp
@@ -387,7 +387,7 @@ ObjectStorageResponse
AzureObjStorageClient::delete_objects_recursively(
return response;
}
- while (!resp.NextPageToken->empty()) {
+ while (resp.NextPageToken.HasValue()) {
list_opts.ContinuationToken = resp.NextPageToken;
resp = s3_get_rate_limit([&]() {
SCOPED_BVAR_LATENCY(s3_bvar::s3_list_latency);
diff --git a/be/test/io/fs/azure_obj_storage_client_test.cpp
b/be/test/io/fs/azure_obj_storage_client_test.cpp
new file mode 100644
index 00000000000..1297e7c75f7
--- /dev/null
+++ b/be/test/io/fs/azure_obj_storage_client_test.cpp
@@ -0,0 +1,144 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "io/fs/azure_obj_storage_client.h"
+
+#include <gtest/gtest.h>
+
+#include "io/fs/file_system.h"
+#include "io/fs/obj_storage_client.h"
+
+#ifdef USE_AZURE
+#include <azure/storage/blobs.hpp>
+#include <azure/storage/blobs/blob_client.hpp>
+#include <azure/storage/blobs/blob_container_client.hpp>
+#include <azure/storage/common/storage_credential.hpp>
+#endif
+
+namespace doris {
+
+#ifdef USE_AZURE
+
+using namespace Azure::Storage::Blobs;
+
+class AzureObjStorageClientTest : public testing::Test {
+protected:
+ static std::shared_ptr<io::ObjStorageClient> obj_storage_client;
+
+ static void SetUpTestSuite() {
+ if (!std::getenv("AZURE_ACCOUNT_NAME") ||
!std::getenv("AZURE_ACCOUNT_KEY") ||
+ !std::getenv("AZURE_CONTAINER_NAME")) {
+ return;
+ }
+
+ std::string accountName = std::getenv("AZURE_ACCOUNT_NAME");
+ std::string accountKey = std::getenv("AZURE_ACCOUNT_KEY");
+ std::string containerName = std::getenv("AZURE_CONTAINER_NAME");
+
+ auto cred =
std::make_shared<Azure::Storage::StorageSharedKeyCredential>(accountName,
+
accountKey);
+ const std::string uri =
+ fmt::format("https://{}.blob.core.windows.net/{}";,
accountName, containerName);
+ auto containerClient = std::make_shared<BlobContainerClient>(uri,
cred);
+ AzureObjStorageClientTest::obj_storage_client =
+
std::make_shared<io::AzureObjStorageClient>(std::move(containerClient));
+ }
+
+ void SetUp() override {
+ if (AzureObjStorageClientTest::obj_storage_client == nullptr) {
+ GTEST_SKIP() << "Skipping Azure test, because AZURE environment
not set";
+ }
+ }
+};
+
+std::shared_ptr<io::ObjStorageClient>
AzureObjStorageClientTest::obj_storage_client = nullptr;
+
+TEST_F(AzureObjStorageClientTest, put_list_delete_object) {
+ LOG(INFO) << "AzureObjStorageClientTest::put_list_delete_object";
+
+ auto response = AzureObjStorageClientTest::obj_storage_client->put_object(
+ {.key = "AzureObjStorageClientTest/put_list_delete_object"},
std::string("aaaa"));
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+
+ std::vector<io::FileInfo> files;
+ // clang-format off
+ response =
AzureObjStorageClientTest::obj_storage_client->list_objects({.bucket = "dummy",
+ .prefix = "AzureObjStorageClientTest/put_list_delete_object",},
&files);
+ // clang-format on
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+ EXPECT_EQ(files.size(), 1);
+ files.clear();
+
+ response = AzureObjStorageClientTest::obj_storage_client->delete_object(
+ {.key = "AzureObjStorageClientTest/put_list_delete_object"});
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+
+ // clang-format off
+ response =
AzureObjStorageClientTest::obj_storage_client->list_objects({.bucket = "dummy",
+ .prefix = "AzureObjStorageClientTest/put_list_delete_object",},
&files);
+ // clang-format on
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+ EXPECT_EQ(files.size(), 0);
+}
+
+TEST_F(AzureObjStorageClientTest, delete_objects_recursively) {
+ LOG(INFO) << "AzureObjStorageClientTest::delete_objects_recursively";
+
+ for (int i = 0; i < 22; i++) {
+ std::string key =
+ "AzureObjStorageClientTest/delete_objects_recursively" +
std::to_string(i);
+
+ auto response =
AzureObjStorageClientTest::obj_storage_client->put_object(
+ {.key = key}, std::string("aaaa"));
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+ LOG(INFO) << "put " << key << " OK";
+ }
+
+ std::vector<io::FileInfo> files;
+ // clang-format off
+ auto response =
AzureObjStorageClientTest::obj_storage_client->list_objects({.bucket = "dummy",
+ .prefix =
"AzureObjStorageClientTest/delete_objects_recursively",}, &files);
+ // clang-format on
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+ EXPECT_EQ(files.size(), 22);
+ files.clear();
+
+ response =
AzureObjStorageClientTest::obj_storage_client->delete_objects_recursively(
+ {.prefix =
"AzureObjStorageClientTest/delete_objects_recursively"});
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+
+ // clang-format off
+ response =
AzureObjStorageClientTest::obj_storage_client->list_objects({.bucket = "dummy",
+ .prefix =
"AzureObjStorageClientTest/delete_objects_recursively",}, &files);
+ // clang-format on
+ EXPECT_EQ(response.status.code, ErrorCode::OK);
+ EXPECT_EQ(files.size(), 0);
+}
+#else
+
+class AzureObjStorageClientTest : public testing::Test {
+protected:
+ void SetUp() override { GTEST_SKIP() << "Skipping Azure test, because
USE_AZURE not defined"; }
+};
+
+TEST_F(AzureObjStorageClientTest, dummy_test) {
+ LOG(INFO) << "AzureObjStorageClientTest::dummy_test";
+}
+
+#endif // #ifdef USE_AZURE
+
+} // namespace doris
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
