update GetBukcetStatResult for more bucket states (#120)

TuodiAunty · web-flow · commit deae8871641d · 2022-05-24T11:29:28.000+08:00
* update GetBukcetStatResult for more bucket states

* update GetBukcetStatResult last modify time to int
diff --git a/sdk/include/alibabacloud/oss/model/GetBucketStatResult.h b/sdk/include/alibabacloud/oss/model/GetBucketStatResult.h
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed 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.
@@ -33,10 +33,31 @@ namespace OSS
         uint64_t Storage() const { return storage_; }
         uint64_t ObjectCount() const { return objectCount_; }
         uint64_t MultipartUploadCount() const { return multipartUploadCount_; }
+        uint64_t LiveChannelCount() const { return liveChannelCount_; }
+        uint64_t LastModifiedTime() const { return lastModifiedTime_; }
+        uint64_t StandardStorage() const { return standardStorage_; }
+        uint64_t StandardObjectCount() const { return standardObjectCount_; }
+        uint64_t InfrequentAccessStorage() const { return infrequentAccessStorage_; }
+        uint64_t InfrequentAccessObjectCount() const { return infrequentAccessObjectCount_; }
+        uint64_t ArchiveStorage() const { return archiveStorage_; }
+        uint64_t ArchiveObjectCount() const { return archiveObjectCount_; }
+        uint64_t ColdArchiveStorage() const { return coldArchiveStorage_; }
+        uint64_t ColdArchiveObjectCount() const { return coldArchiveObjectCount_; }
+
     private:
         uint64_t storage_;
         uint64_t objectCount_;
         uint64_t multipartUploadCount_;
+        uint64_t liveChannelCount_;
+        uint64_t lastModifiedTime_;
+        uint64_t standardStorage_;
+        uint64_t standardObjectCount_;
+        uint64_t infrequentAccessStorage_;
+        uint64_t infrequentAccessObjectCount_;
+        uint64_t archiveStorage_;
+        uint64_t archiveObjectCount_;
+        uint64_t coldArchiveStorage_;
+        uint64_t coldArchiveObjectCount_;
     };
-} 
+}
 }
diff --git a/sdk/src/model/GetBucketStatResult.cc b/sdk/src/model/GetBucketStatResult.cc
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed 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.
@@ -26,7 +26,17 @@ GetBucketStatResult::GetBucketStatResult() :
     OssResult(),
     storage_(0),
     objectCount_(0),
-    multipartUploadCount_(0)
+    multipartUploadCount_(0),
+    liveChannelCount_(0),
+    lastModifiedTime_(0),
+    standardStorage_(0),
+    standardObjectCount_(0),
+    infrequentAccessStorage_(0),
+    infrequentAccessObjectCount_(0),
+    archiveStorage_(0),
+    archiveObjectCount_(0),
+    coldArchiveStorage_(0),
+    coldArchiveObjectCount_(0)
 {
 }
 
@@ -61,7 +71,38 @@ GetBucketStatResult& GetBucketStatResult::operator =(const std::string& result)
             node = root->FirstChildElement("MultipartUploadCount");
             if (node && node->GetText()) multipartUploadCount_ = atoll(node->GetText());
 
+            node = root->FirstChildElement("LiveChannelCount");
+            if (node && node->GetText()) liveChannelCount_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("LastModifiedTime");
+            if (node && node->GetText()) lastModifiedTime_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("StandardStorage");
+            if (node && node->GetText()) standardStorage_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("StandardObjectCount");
+            if (node && node->GetText()) standardObjectCount_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("InfrequentAccessStorage");
+            if (node && node->GetText()) infrequentAccessStorage_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("InfrequentAccessObjectCount");
+            if (node && node->GetText()) infrequentAccessObjectCount_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("ArchiveStorage");
+            if (node && node->GetText()) archiveStorage_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("ArchiveObjectCount");
+            if (node && node->GetText()) archiveObjectCount_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("ColdArchiveStorage");
+            if (node && node->GetText()) coldArchiveStorage_ = atoll(node->GetText());
+
+            node = root->FirstChildElement("ColdArchiveObjectCount");
+            if (node && node->GetText()) coldArchiveObjectCount_ = atoll(node->GetText());
+
             parseDone_ = true;
+
 		}
     }
     return *this;
diff --git a/test/src/Bucket/BucketBasicOperationTest.cc b/test/src/Bucket/BucketBasicOperationTest.cc
@@ -33,13 +33,13 @@ class BucketBasicOperationTest : public ::testing::Test {
     }
 
     // Sets up the stuff shared by all tests in this test case.
-    static void SetUpTestCase() 
+    static void SetUpTestCase()
     {
         Client = std::make_shared<OssClient>(Config::Endpoint, Config::AccessKeyId, Config::AccessKeySecret, ClientConfiguration());
     }
 
     // Tears down the stuff shared by all tests in this test case.
-    static void TearDownTestCase() 
+    static void TearDownTestCase()
     {
         Client = nullptr;
     }
@@ -210,7 +210,7 @@ TEST_F(BucketBasicOperationTest, GetBucketInfoTest)
     auto bfOutcome = Client->GetBucketInfo(request);
     EXPECT_EQ(bfOutcome.isSuccess(), true);
     EXPECT_EQ(bfOutcome.result().Acl(), CannedAccessControlList::Private);
-    
+
     Client->SetBucketAcl(SetBucketAclRequest(bucketName, CannedAccessControlList::PublicRead));
     TestUtils::WaitForCacheExpire(5);
     bfOutcome = Client->GetBucketInfo(request);
@@ -505,6 +505,42 @@ TEST_F(BucketBasicOperationTest, GetBucketStatResult)
     EXPECT_EQ(result.Storage(), 1024123ULL);
 }
 
+TEST_F(BucketBasicOperationTest, GetBucketStatResultEnhancedTest)
+{
+    std::string xml = R"(<?xml version="1.0" encoding="UTF-8"?>
+                        <BucketStat>
+                          <Storage>1600</Storage>
+                          <ObjectCount>230</ObjectCount>
+                          <MultipartUploadCount>40</MultipartUploadCount>
+                          <LiveChannelCount>4</LiveChannelCount>
+                          <LastModifiedTime>153221331</LastModifiedTime>
+                          <StandardStorage>430</StandardStorage>
+                          <StandardObjectCount>66</StandardObjectCount>
+                          <InfrequentAccessStorage>2359296</InfrequentAccessStorage>
+                          <InfrequentAccessObjectCount>54</InfrequentAccessObjectCount>
+                          <ArchiveStorage>2949120</ArchiveStorage>
+                          <ArchiveObjectCount>74</ArchiveObjectCount>
+                          <ColdArchiveStorage>2359296</ColdArchiveStorage>
+                          <ColdArchiveObjectCount>36</ColdArchiveObjectCount>
+                        </BucketStat>)";
+
+    GetBucketStatResult result(xml);
+    EXPECT_EQ(result.MultipartUploadCount(), 40ULL);
+    EXPECT_EQ(result.ObjectCount(), 230ULL);
+    EXPECT_EQ(result.Storage(), 1600ULL);
+    EXPECT_EQ(result.LiveChannelCount(), 4ULL);
+    EXPECT_EQ(result.LastModifiedTime(), 153221331ULL);
+    EXPECT_EQ(result.StandardStorage(), 430ULL);
+    EXPECT_EQ(result.StandardObjectCount(), 66ULL);
+    EXPECT_EQ(result.InfrequentAccessStorage(), 2359296ULL);
+    EXPECT_EQ(result.InfrequentAccessObjectCount(), 54ULL);
+    EXPECT_EQ(result.ArchiveStorage(), 2949120ULL);
+    EXPECT_EQ(result.ArchiveObjectCount(), 74ULL);
+    EXPECT_EQ(result.ColdArchiveStorage(), 2359296ULL);
+    EXPECT_EQ(result.ColdArchiveObjectCount(), 36ULL);
+}
+
+
 TEST_F(BucketBasicOperationTest, GetBucketLocationResult)
 {
     std::string xml = R"(<?xml version="1.0" encoding="UTF-8"?>
@@ -792,6 +828,24 @@ TEST_F(BucketBasicOperationTest, GetBucketInfoResultBranchTest)
 
     xml = R"(<?xml version="1.0" encoding="UTF-8"?>)";
     GetBucketStatResult result15(xml);
+
+    xml = R"(<?xml version="1.0" encoding="UTF-8"?>
+              <BucketStat>
+                <Storage></Storage>
+                <ObjectCount></ObjectCount>
+                <MultipartUploadCount></MultipartUploadCount>
+                <LiveChannelCount></LiveChannelCount>
+                <LastModifiedTime></LastModifiedTime>
+                <StandardStorage></StandardStorage>
+                <StandardObjectCount></StandardObjectCount>
+                <InfrequentAccessStorage></InfrequentAccessStorage>
+                <InfrequentAccessObjectCount></InfrequentAccessObjectCount>
+                <ArchiveStorage></ArchiveStorage>
+                <ArchiveObjectCount></ArchiveObjectCount>
+                <ColdArchiveStorage></ColdArchiveStorage>
+                <ColdArchiveObjectCount></ColdArchiveObjectCount>
+              </BucketStat>)";
+    GetBucketStatResult result16(xml);
 }
 
 TEST_F(BucketBasicOperationTest, ListBucketsResultBranchTest)
@@ -800,7 +854,7 @@ TEST_F(BucketBasicOperationTest, ListBucketsResultBranchTest)
 
     std::string xml = R"(<?xml version="1.0" encoding="UTF-8"?>
                         <ListAllMyBuckets>
-                          
+
                         </ListAllMyBuckets>)";
     ListBucketsResult result1(xml);
 
@@ -828,9 +882,9 @@ TEST_F(BucketBasicOperationTest, ListBucketsResultBranchTest)
                           </Owner>
                           <Buckets>
                             <Bucket>
-                              
+
                             </Bucket>
-                          
+
                           </Buckets>
                         </ListAllMyBucketsResult>)";
     ListBucketsResult result4(xml);
@@ -856,7 +910,7 @@ TEST_F(BucketBasicOperationTest, ListBucketsResultBranchTest)
                             <Name></Name>
                             <StorageClass></StorageClass>
                             </Bucket>
-                          
+
                           </Buckets>
                         </ListAllMyBucketsResult>)";
     ListBucketsResult result5(xml);
@@ -867,7 +921,7 @@ TEST_F(BucketBasicOperationTest, ListBucketsResultBranchTest)
 
 TEST_F(BucketBasicOperationTest, BucketColdArchiveTest)
 {
-    std::string endpoint = "http://oss-ap-southeast-2.aliyuncs.com";
+    std::string endpoint = "http://oss-ap-southeast-2.aliyuncs.com";
     auto client = std::make_shared<OssClient>(endpoint, Config::AccessKeyId, Config::AccessKeySecret, ClientConfiguration());
 
     //get a random bucketName
