Skip to content

Commit

Permalink
v2.3.5
Browse files Browse the repository at this point in the history
Signed-off-by: Ji Bin <[email protected]>
  • Loading branch information
matrixji committed Jan 19, 2024
1 parent 159092a commit 989a099
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 2 deletions.
2 changes: 1 addition & 1 deletion milvus_binary/env.sh
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From fdfae1e33273fe7d38acc30b0c3c2b9482fa068f Mon Sep 17 00:00:00 2001
From: Ji Bin <[email protected]>
Date: Mon, 13 Nov 2023 23:20:16 +0800
Subject: [PATCH 1/2] link with CoreServices for macos

Signed-off-by: Ji Bin <[email protected]>
---
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

25 changes: 25 additions & 0 deletions milvus_binary/patches/milvus-v2.3.5/0002-fix-for-gettid.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 55c8bb41d2900be71befdc161ea304dd483e1a19 Mon Sep 17 00:00:00 2001
From: Ji Bin <[email protected]>
Date: Sun, 5 Nov 2023 18:49:29 +0800
Subject: [PATCH 2/2] fix for gettid

Signed-off-by: Ji Bin <[email protected]>
---
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

2 changes: 1 addition & 1 deletion src/milvus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import json
import hashlib

__version__ = '2.3.4'
__version__ = '2.3.5'

LOGGERS = {}

Expand Down
2 changes: 2 additions & 0 deletions src/milvus/data/config.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 989a099

Please sign in to comment.