From 8d9c70b89b04b0a3e71efa0148ed1f4f571a768a Mon Sep 17 00:00:00 2001 From: Min Tian Date: Fri, 30 May 2025 10:14:30 +0800 Subject: [PATCH] fix: [2.5] Not need knowhere for thread control when calling knowhere-iterator (#42136) (#42133) issue: #42132 pr: #42136 When calling knowhere-iterator, the thread pool control of knowhere is no longer needed. Signed-off-by: min.tian --- internal/core/src/index/VectorDiskIndex.cpp | 2 +- internal/core/src/index/VectorMemIndex.cpp | 2 +- internal/core/src/query/SearchBruteForce.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/core/src/index/VectorDiskIndex.cpp b/internal/core/src/index/VectorDiskIndex.cpp index ac0314420c..33e444ddbd 100644 --- a/internal/core/src/index/VectorDiskIndex.cpp +++ b/internal/core/src/index/VectorDiskIndex.cpp @@ -316,7 +316,7 @@ knowhere::expected> VectorDiskAnnIndex::VectorIterators(const DatasetPtr dataset, const knowhere::Json& conf, const BitsetView& bitset) const { - return this->index_.AnnIterator(dataset, conf, bitset); + return this->index_.AnnIterator(dataset, conf, bitset, false); } template diff --git a/internal/core/src/index/VectorMemIndex.cpp b/internal/core/src/index/VectorMemIndex.cpp index 56bceecfda..346dbfbf1d 100644 --- a/internal/core/src/index/VectorMemIndex.cpp +++ b/internal/core/src/index/VectorMemIndex.cpp @@ -117,7 +117,7 @@ knowhere::expected> VectorMemIndex::VectorIterators(const milvus::DatasetPtr dataset, const knowhere::Json& conf, const milvus::BitsetView& bitset) const { - return this->index_.AnnIterator(dataset, conf, bitset); + return this->index_.AnnIterator(dataset, conf, bitset, false); } template diff --git a/internal/core/src/query/SearchBruteForce.cpp b/internal/core/src/query/SearchBruteForce.cpp index 38887a1509..46863d839a 100644 --- a/internal/core/src/query/SearchBruteForce.cpp +++ b/internal/core/src/query/SearchBruteForce.cpp @@ -235,22 +235,22 @@ DispatchBruteForceIteratorByDataType(const knowhere::DataSetPtr& base_dataset, switch (data_type) { case DataType::VECTOR_FLOAT: return knowhere::BruteForce::AnnIterator( - base_dataset, query_dataset, config, bitset); + base_dataset, query_dataset, config, bitset, false); break; case DataType::VECTOR_FLOAT16: //todo: if knowhere support real fp16/bf16 bf, change it return knowhere::BruteForce::AnnIterator( - base_dataset, query_dataset, config, bitset); + base_dataset, query_dataset, config, bitset, false); break; case DataType::VECTOR_BFLOAT16: //todo: if knowhere support real fp16/bf16 bf, change it return knowhere::BruteForce::AnnIterator( - base_dataset, query_dataset, config, bitset); + base_dataset, query_dataset, config, bitset, false); break; case DataType::VECTOR_SPARSE_FLOAT: return knowhere::BruteForce::AnnIterator< knowhere::sparse::SparseRow>( - base_dataset, query_dataset, config, bitset); + base_dataset, query_dataset, config, bitset, false); break; default: PanicInfo(ErrorCode::Unsupported,