admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-02-04 11:18:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix retrieving may return more result than limit (#26670)

Browse Source 
Signed-off-by: yah01 <yah2er0ne@outlook.com>
This commit is contained in:
yah01 2023-09-06 17:47:15 +08:00 committed by GitHub
parent 28681276e2
commit 4a2377e669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/core/src/segcore/InsertRecord.h
View File

@ -104,21 +104,23 @@ class OffsetOrderedMap : public OffsetMap {
find_first_by_index(int64_t limit,
const BitsetType& bitset,
bool false_filtered_out) const {
std::vector<int64_t> seg_offsets;
seg_offsets.reserve(limit);
int64_t hit_num = 0; // avoid counting the number everytime.
auto cnt = bitset.count();
int64_t cnt = bitset.count();
if (!false_filtered_out) {
cnt = bitset.size() - bitset.count();
}
for (auto it = map_.begin(); it != map_.end(); it++) {
if (hit_num >= limit || hit_num >= cnt) {
break;
}
limit = std::min(limit, cnt);
std::vector<int64_t> seg_offsets;
seg_offsets.reserve(limit);
for (auto it = map_.begin(); hit_num < limit && it != map_.end();
it++) {
for (auto seg_offset : it->second) {
if (!(bitset[seg_offset] ^ false_filtered_out)) {
seg_offsets.push_back(seg_offset);
hit_num++;
if (hit_num >= limit) {
break;
}
}
}
}
@ -191,17 +193,16 @@ class OffsetOrderedArray : public OffsetMap {
find_first_by_index(int64_t limit,
const BitsetType& bitset,
bool false_filtered_out) const {
std::vector<int64_t> seg_offsets;
seg_offsets.reserve(limit);
int64_t hit_num = 0; // avoid counting the number everytime.
auto cnt = bitset.count();
int64_t cnt = bitset.count();
if (!false_filtered_out) {
cnt = bitset.size() - bitset.count();
}
for (auto it = array_.begin(); it != array_.end(); it++) {
if (hit_num >= limit || hit_num >= cnt) {
break;
}
limit = std::min(limit, cnt);
std::vector<int64_t> seg_offsets;
seg_offsets.reserve(limit);
for (auto it = array_.begin(); hit_num < limit && it != array_.end();
it++) {
if (!(bitset[it->second] ^ false_filtered_out)) {
seg_offsets.push_back(it->second);
hit_num++;