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

Fix data after travel timestamp is still visible (#22813) 

Signed-off-by: yah01 <yang.cen@zilliz.com>
pull/22832/head
yah01 2023-03-17 18:03:55 +08:00 committed by GitHub
parent dff15c3488
commit 99f31dc37a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/core/src/segcore/Utils.h
View File

@ -109,28 +109,20 @@ get_deleted_bitmap(int64_t del_barrier,
: delete_timestamps[pk];
}
for (auto iter = delete_timestamps.begin(); iter != delete_timestamps.end();
iter++) {
auto pk = iter->first;
auto delete_timestamp = iter->second;
for (auto& [pk, timestamp] : delete_timestamps) {
auto segOffsets = insert_record.search_pk(pk, insert_barrier);
for (auto offset : segOffsets) {
int64_t insert_row_offset = offset.get();
// for now, insert_barrier == insert count of segment, so this Assert will always work
AssertInfo(insert_row_offset < insert_barrier,
"Timestamp offset is larger than insert barrier");
// insert after delete with same pk, delete will not task effect on this insert record
// The deletion record do not take effect in search/query,
// and reset bitmap to 0
if (insert_record.timestamps_[insert_row_offset] >=
delete_timestamp) {
if (timestamp > query_timestamp) {
bitmap->reset(insert_row_offset);
continue;
}
// the deletion record do not take effect in search/query
// Insert after delete with same pk, delete will not task effect on this insert record,
// and reset bitmap to 0
if (delete_timestamp > query_timestamp) {
if (insert_record.timestamps_[insert_row_offset] >= timestamp) {
bitmap->reset(insert_row_offset);
continue;
}

2
internal/proxy/task_search.go
View File

@ -363,7 +363,7 @@ func (t *searchTask) PreExecute(ctx context.Context) error {
travelTimestamp := t.request.TravelTimestamp
if travelTimestamp == 0 {
travelTimestamp = typeutil.MaxTimestamp
travelTimestamp = t.BeginTs()
}
err = validateTravelTimestamp(travelTimestamp, t.BeginTs())
if err != nil {