diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index 664b30d29c..3f59c81a36 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -13,9 +13,9 @@ class MilvusConan(ConanFile): "lz4/1.9.4#c5afb86edd69ac0df30e3a9e192e43db", "snappy/1.1.9#0519333fef284acd04806243de7d3070", "lzo/2.10#9517fc1bcc4d4cc229a79806003a1baa", - "arrow/17.0.0@milvus/dev", + "arrow/17.0.0@milvus/dev-2.6#7af258a853e20887f9969f713110aac8", "openssl/3.1.2#02594c4c0a6e2b4feb3cd15119993597", - "aws-sdk-cpp/1.9.234#28d6d2c175975900ce292bafe8022c88", + "aws-sdk-cpp/1.11.352@milvus/dev", "googleapis/cci.20221108#65604e1b3b9a6b363044da625b201a2a", "benchmark/1.7.0#459f3bb1a64400a886ba43047576df3c", "gtest/1.13.0#f9548be18a41ccc6367efcb8146e92be", @@ -73,6 +73,7 @@ class MilvusConan(ConanFile): "aws-sdk-cpp:config": True, "aws-sdk-cpp:text-to-speech": False, "aws-sdk-cpp:transfer": False, + "aws-sdk-cpp:s3-crt": True, "gtest:build_gmock": True, "boost:without_locale": False, "boost:without_test": True, diff --git a/internal/core/src/storage/AliyunSTSClient.cpp b/internal/core/src/storage/AliyunSTSClient.cpp index cf54f9d4c9..169938cace 100644 --- a/internal/core/src/storage/AliyunSTSClient.cpp +++ b/internal/core/src/storage/AliyunSTSClient.cpp @@ -39,11 +39,6 @@ class HttpRequest; enum class HttpResponseCode; } // namespace Http -namespace Client { -Aws::String -ComputeUserAgentString(); -} - namespace Internal { static const char STS_RESOURCE_CLIENT_LOG_TAG[] = diff --git a/internal/core/src/storage/TencentCloudSTSClient.cpp b/internal/core/src/storage/TencentCloudSTSClient.cpp index 18915c2bb4..a1423bab47 100644 --- a/internal/core/src/storage/TencentCloudSTSClient.cpp +++ b/internal/core/src/storage/TencentCloudSTSClient.cpp @@ -34,11 +34,6 @@ class HttpRequest; enum class HttpResponseCode; } // namespace Http -namespace Client { -Aws::String -ComputeUserAgentString(); -} - namespace Internal { static const char STS_RESOURCE_CLIENT_LOG_TAG[] = diff --git a/internal/core/thirdparty/milvus-storage/CMakeLists.txt b/internal/core/thirdparty/milvus-storage/CMakeLists.txt index a16f65737d..88a23dec97 100644 --- a/internal/core/thirdparty/milvus-storage/CMakeLists.txt +++ b/internal/core/thirdparty/milvus-storage/CMakeLists.txt @@ -14,7 +14,7 @@ # Update milvus-storage_VERSION for the first occurrence milvus_add_pkg_config("milvus-storage") set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "") -set( milvus-storage_VERSION e148155 ) +set( milvus-storage_VERSION 15b7fc7 ) set( GIT_REPOSITORY "https://github.com/milvus-io/milvus-storage.git") message(STATUS "milvus-storage repo: ${GIT_REPOSITORY}") message(STATUS "milvus-storage version: ${milvus-storage_VERSION}")