milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: [2.5] update knowhere version and IsAdditionalScalarSupported interface (#39574) 

pr: #39573

---------

Signed-off-by: chasingegg <chao.gao@zilliz.com>
pull/39466/head
Gao 2025-02-05 19:53:11 +08:00 committed by GitHub
parent 22a69b5399
commit aee9368c6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/core/src/index/VectorDiskIndex.cpp
View File

@ -159,7 +159,11 @@ VectorDiskAnnIndex<T>::Build(const Config& config) {
}
auto opt_fields = GetValueFromConfig<OptFieldT>(config, VEC_OPT_FIELDS);
if (opt_fields.has_value() && index_.IsAdditionalScalarSupported()) {
auto is_partition_key_isolation =
GetValueFromConfig<bool>(build_config, "partition_key_isolation");
if (opt_fields.has_value() &&
index_.IsAdditionalScalarSupported(
is_partition_key_isolation.value_or(false))) {
build_config[VEC_OPT_FIELDS_PATH] =
file_manager_->CacheOptFieldToDisk(opt_fields.value());
// `partition_key_isolation` is already in the config, so it falls through

7
internal/core/src/index/VectorMemIndex.cpp
View File

@ -287,8 +287,11 @@ VectorMemIndex<T>::Build(const Config& config) {
auto opt_fields = GetValueFromConfig<OptFieldT>(config, VEC_OPT_FIELDS);
std::unordered_map<int64_t, std::vector<std::vector<uint32_t>>> scalar_info;
if (opt_fields.has_value() && index_.IsAdditionalScalarSupported() &&
config.value("partition_key_isolation", false)) {
auto is_partition_key_isolation =
GetValueFromConfig<bool>(config, "partition_key_isolation");
if (opt_fields.has_value() &&
index_.IsAdditionalScalarSupported(
is_partition_key_isolation.value_or(false))) {
scalar_info = file_manager_->CacheOptFieldToMemory(opt_fields.value());
}

2
internal/core/thirdparty/knowhere/CMakeLists.txt vendored
View File

@ -14,7 +14,7 @@
# Update KNOWHERE_VERSION for the first occurrence
milvus_add_pkg_config("knowhere")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "")
set( KNOWHERE_VERSION v2.5.2 )
set( KNOWHERE_VERSION fcd447d )
set( GIT_REPOSITORY "https://github.com/zilliztech/knowhere.git")
message(STATUS "Knowhere repo: ${GIT_REPOSITORY}")
message(STATUS "Knowhere version: ${KNOWHERE_VERSION}")