From 69a82acc4632e032978f5e7c817929608495b9bf Mon Sep 17 00:00:00 2001 From: congqixia Date: Fri, 2 Feb 2024 16:05:06 +0800 Subject: [PATCH] enhance: [Cherry-pick] Set delete scope for LoadSegment streaming data (#30245) (#30367) Cherry pick from master pr: #30245 See also #29474 --------- Signed-off-by: Congqi Xia --- internal/querynodev2/delegator/delegator_data.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/querynodev2/delegator/delegator_data.go b/internal/querynodev2/delegator/delegator_data.go index 2099cb8e61..d3319a9bc6 100644 --- a/internal/querynodev2/delegator/delegator_data.go +++ b/internal/querynodev2/delegator/delegator_data.go @@ -458,6 +458,7 @@ func (sd *shardDelegator) loadStreamDelete(ctx context.Context, } deleteData := &storage.DeleteData{} + // start position is dml position for segment // if this position is before deleteBuffer's safe ts, it means some delete shall be read from msgstream if position.GetTimestamp() < sd.deleteBuffer.SafeTs() { @@ -497,6 +498,7 @@ func (sd *shardDelegator) loadStreamDelete(ctx context.Context, SegmentId: info.GetSegmentID(), PrimaryKeys: storage.ParsePrimaryKeys2IDs(deleteData.Pks), Timestamps: deleteData.Tss, + Scope: querypb.DataScope_Historical, }) if err != nil { log.Warn("failed to apply delete when LoadSegment", zap.Error(err))