diff --git a/milvus_binary/env.sh b/milvus_binary/env.sh index 3639401..d118722 100644 --- a/milvus_binary/env.sh +++ b/milvus_binary/env.sh @@ -1,5 +1,5 @@ MILVUS_REPO="https://github.com/milvus-io/milvus.git" -MILVUS_VERSION="v2.3.4" +MILVUS_VERSION="v2.3.5" BUILD_PROXY= BUILD_FORCE=NO diff --git a/milvus_binary/patches/milvus-v2.3.5/0001-link-with-CoreServices-for-macos.patch b/milvus_binary/patches/milvus-v2.3.5/0001-link-with-CoreServices-for-macos.patch new file mode 100644 index 0000000..a8a67f5 --- /dev/null +++ b/milvus_binary/patches/milvus-v2.3.5/0001-link-with-CoreServices-for-macos.patch @@ -0,0 +1,29 @@ +From fdfae1e33273fe7d38acc30b0c3c2b9482fa068f Mon Sep 17 00:00:00 2001 +From: Ji Bin +Date: Mon, 13 Nov 2023 23:20:16 +0800 +Subject: [PATCH 1/2] link with CoreServices for macos + +Signed-off-by: Ji Bin +--- + internal/core/src/storage/azure-blob-storage/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt +index 62b2e971c..bf803da35 100644 +--- a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt ++++ b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt +@@ -36,6 +36,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-return-type - + add_library(blob-chunk-manager SHARED AzureBlobChunkManager.cpp) + target_link_libraries(blob-chunk-manager PUBLIC Azure::azure-identity Azure::azure-storage-blobs) + ++if (APPLE) ++ find_library(CORESERVICES_LIBRARY CoreServices) ++ target_link_libraries(blob-chunk-manager PRIVATE ${CORESERVICES_LIBRARY}) ++endif (APPLE) ++ + install(TARGETS blob-chunk-manager DESTINATION "${CMAKE_INSTALL_LIBDIR}") + + if ( BUILD_UNIT_TEST STREQUAL "ON" ) +-- +2.43.0 + diff --git a/milvus_binary/patches/milvus-v2.3.5/0002-fix-for-gettid.patch b/milvus_binary/patches/milvus-v2.3.5/0002-fix-for-gettid.patch new file mode 100644 index 0000000..beca392 --- /dev/null +++ b/milvus_binary/patches/milvus-v2.3.5/0002-fix-for-gettid.patch @@ -0,0 +1,25 @@ +From 55c8bb41d2900be71befdc161ea304dd483e1a19 Mon Sep 17 00:00:00 2001 +From: Ji Bin +Date: Sun, 5 Nov 2023 18:49:29 +0800 +Subject: [PATCH 2/2] fix for gettid + +Signed-off-by: Ji Bin +--- + internal/core/thirdparty/knowhere/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt +index 80781717c..c46b50783 100644 +--- a/internal/core/thirdparty/knowhere/CMakeLists.txt ++++ b/internal/core/thirdparty/knowhere/CMakeLists.txt +@@ -41,6 +41,7 @@ FetchContent_Declare( + GIT_TAG ${KNOWHERE_VERSION} + SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-src + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-build ++ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/../../../patches/knowhere-v2.2.2.patch + DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} ) + + FetchContent_GetProperties( knowhere ) +-- +2.43.0 + diff --git a/src/milvus/__init__.py b/src/milvus/__init__.py index 54a9150..1932516 100644 --- a/src/milvus/__init__.py +++ b/src/milvus/__init__.py @@ -21,7 +21,7 @@ import json import hashlib -__version__ = '2.3.4' +__version__ = '2.3.5' LOGGERS = {} diff --git a/src/milvus/data/config.yaml.template b/src/milvus/data/config.yaml.template index 3e79436..79e4ef8 100644 --- a/src/milvus/data/config.yaml.template +++ b/src/milvus/data/config.yaml.template @@ -567,6 +567,8 @@ common: info: 500 # minimum milliseconds for printing durations in info level warn: 1000 # minimum milliseconds for printing durations in warn level ttMsgEnabled: true # Whether the instance disable sending ts messages + bloomFilterSize: 100000 + maxBloomFalsePositive: 0.05 # QuotaConfig, configurations of Milvus quota and limits. # By default, we enable: