Merge pull request #59 from volcengine/release_2.6.18

2.6.18 GetObjectToFile interface stability reinforcement

Author: lingyun-tos

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Release Note
 
+### 2025.8.23 Version 2.6.18
+- GetObjectToFile 接口稳定性加固
+
 ### 2025.8.4 Version 2.6.17
 - 支持 deleteObject 接口携带 if-match 
 - 支持事件通知回调

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(ve-tos-cpp-sdk
-        VERSION 2.6.17
+        VERSION 2.6.18
         LANGUAGES CXX)
 
 # project settings

example/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-example
-        VERSION 2.6.17
+        VERSION 2.6.18
         LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} example.cc)

sdk/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-lib
-        VERSION 2.6.17
+        VERSION 2.6.18
         LANGUAGES CXX)
 set(SDK_HEADER
         include/auth/Credential.h

sdk/include/TosClient.h

@@ -57,7 +57,7 @@
 #include "model/object/ModifyObjectInput.h"
 #include "model/object/ModifyObjectOutput.h"
 namespace VolcengineTos {
-static const char* TOS_SDK_VERSION = "v2.6.17";
+static const char* TOS_SDK_VERSION = "v2.6.18";
 #ifdef WIN32
 static const char* PLATFORM_NAME = "windows";
 #elif __linux__

sdk/src/TosClientImpl.cc

@@ -7534,12 +7534,21 @@ bool TosClientImpl::checkShouldRetry(const std::shared_ptr<TosRequest>& request,
     if (resCode == 429 || resCode >= 500 || curlErrShouldRetry) {
         if (request->getMethod() == http::MethodGet || request->getMethod() == http::MethodHead) {
             if (request->getMethod() == http::MethodGet) {
-                auto content_ = request->getContent();
-                if (content_ != nullptr) {
+
+                if (auto content_ = request->getContent(); content_ != nullptr) {
                     int64_t contentLength_ = calContentLength(content_);
                     if (contentLength_ != 0) {
                         return false;
                     }
+                } else if (auto fileContent_ = request->getFileContent(); fileContent_ != nullptr) {
+                    // 重置流状态
+                    fileContent_->clear();
+                    // 重置写位置到开头
+                    fileContent_->seekp(0, std::ios::beg);
+
+                    if (fileContent_->bad() || fileContent_->fail()) {
+                        return false;
+                    }
                 }
             }
             return true;

sdk/src/transport/http/HttpClient.cc

@@ -29,6 +29,9 @@ struct ResourceManager {
 
 static void processHandler(const DataTransferStatusChange& handler, int64_t consumedBytes, int64_t totalBytes,
                            int64_t rwOnceBytes, DataTransferType type, void* userData) {
+    if (!handler){
+        return;
+    }
     DataTransferStatus dataTransferStatus{consumedBytes, totalBytes, rwOnceBytes, type, userData};
     auto data = std::make_shared<DataTransferStatus>(dataTransferStatus);
     handler(data);
@@ -38,9 +41,12 @@ static size_t sendBody(char* ptr, size_t size, size_t nmemb, void* data) {
     auto* resourceMan = static_cast<ResourceManager*>(data);
 
     if (resourceMan == nullptr || resourceMan->httpReq == nullptr) {
-        resourceMan->dataTransferType = 4;
-        processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
-                       resourceMan->userData);
+        if (resourceMan != nullptr) {
+            resourceMan->dataTransferType = 4;
+            processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
+                           resourceMan->userData);
+        }
+
         return 0;
     }
     std::shared_ptr<std::iostream>& content = resourceMan->httpReq->Body();
@@ -95,6 +101,8 @@ static size_t recvBody(char* ptr, size_t size, size_t nmemb, void* userdata) {
     auto* resourceMan = static_cast<ResourceManager*>(userdata);
     const size_t wanted = size * nmemb;
 
+    auto logger = LogUtils::GetLogger();
+
     // 第一次回调
     if (resourceMan->progress && resourceMan->dataTransferType == 1) {
         if (resourceMan->total == -1) {
@@ -117,9 +125,12 @@ static size_t recvBody(char* ptr, size_t size, size_t nmemb, void* userdata) {
     }
 
     if (resourceMan == nullptr || resourceMan->httpResp == nullptr || wanted == 0) {
-        resourceMan->dataTransferType = 4;
-        processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
-                       resourceMan->userData);
+        if (resourceMan != nullptr) {
+            resourceMan->dataTransferType = 4;
+            processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
+                           resourceMan->userData);
+        }
+
         return -1;
     }
     // 第一次receive response body , 初始化state->resposne->body
@@ -136,6 +147,9 @@ static size_t recvBody(char* ptr, size_t size, size_t nmemb, void* userdata) {
     }
     std::shared_ptr<std::iostream>& content = resourceMan->httpResp->Body();
     if (content == nullptr || content->fail()) {
+        if (logger != nullptr) {
+            logger->error("recvBody content init err");
+        }
         resourceMan->dataTransferType = 4;
         processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
                        resourceMan->userData);
@@ -147,6 +161,9 @@ static size_t recvBody(char* ptr, size_t size, size_t nmemb, void* userdata) {
 //    }
 
     if (content->bad()) {
+        if (logger != nullptr) {
+            logger->error("recvBody content write err, please check disk space, file permission, network, etc.");
+        }
         resourceMan->dataTransferType = 4;
         processHandler(resourceMan->progress, resourceMan->send, resourceMan->total, 0, resourceMan->dataTransferType,
                        resourceMan->userData);

test/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-test
-        VERSION 2.6.17
+        VERSION 2.6.18
         LANGUAGES CXX)
 
 include(FetchContent)

test/src/Object/ObjectPutGetTest.cc

@@ -20,7 +20,7 @@ class ObjectPutGetTest : public ::testing::Test {
         conf.maxRetryCount = 0;
         conf.userAgentProductName = "tos";
         conf.userAgentSoftName="cxxSdk";
-        conf.userAgentSoftVersion = "2.6.17";
+        conf.userAgentSoftVersion = "2.6.18";
         conf.userAgentCustomizedKeyValues = {{"key1", "value1"}, {"key2", "value2"}};
         cliV2 = std::make_shared<TosClientV2>(TestConfig::Region, TestConfig::Ak, TestConfig::Sk, conf);
         bkt_name = TestUtils::GetBucketName(TestConfig::TestPrefix);

test/src/Object/ObjectRenameTest.cc

@@ -20,7 +20,7 @@ class ObjectRenameTest : public ::testing::Test {
         conf.maxRetryCount = 0;
         conf.userAgentProductName = "tos";
         conf.userAgentSoftName="cxxSdk";
-        conf.userAgentSoftVersion = "2.6.17";
+        conf.userAgentSoftVersion = "2.6.18";
         conf.userAgentCustomizedKeyValues = {{"key1", "value1"}, {"key2", "value2"}};
         cliV2 = std::make_shared<TosClientV2>(TestConfig::Region, TestConfig::Ak, TestConfig::Sk, conf);
         bkt_name = TestUtils::GetBucketName(TestConfig::TestPrefix);