fix: [cp][2.5] use max MvccTs for iterator (milvus-io#37248)

issue: milvus-io#37158 pr: milvus-io#37247 Signed-off-by: Patrick Weizhi Xu <[email protected]> (cherry picked from commit 5ed7230)
congqixia · Oct 30, 2024 · faf53cc · faf53cc
1 parent 44c1aa5
commit faf53cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/internal/proxy/task_query.go b/internal/proxy/task_query.go
@@ -551,7 +551,7 @@ func (t *queryTask) PostExecute(ctx context.Context) error {
 
 	if t.queryParams.isIterator && t.request.GetGuaranteeTimestamp() == 0 {
 		// first page for iteration, need to set up sessionTs for iterator
-		t.result.SessionTs = t.GetGuaranteeTimestamp()
+		t.result.SessionTs = getMaxMvccTsFromChannels(t.channelsMvcc, t.BeginTs())
 	}
 	log.Debug("Query PostExecute done")
 	return nil

diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go
@@ -745,7 +745,7 @@ func (t *searchTask) PostExecute(ctx context.Context) error {
 	t.result.CollectionName = t.request.GetCollectionName()
 	if t.isIterator && t.request.GetGuaranteeTimestamp() == 0 {
 		// first page for iteration, need to set up sessionTs for iterator
-		t.result.SessionTs = t.SearchRequest.GetGuaranteeTimestamp()
+		t.result.SessionTs = getMaxMvccTsFromChannels(t.queryChannelsTs, t.BeginTs())
 	}
 
 	metrics.ProxyReduceResultLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10), metrics.SearchLabel).Observe(float64(tr.RecordSpan().Milliseconds()))

diff --git a/internal/proxy/util.go b/internal/proxy/util.go
@@ -1001,6 +1001,22 @@ func parseGuaranteeTs(ts, tMax typeutil.Timestamp) typeutil.Timestamp {
 	return ts
 }
 
+func getMaxMvccTsFromChannels(channelsTs map[string]uint64, beginTs typeutil.Timestamp) typeutil.Timestamp {
+	maxTs := typeutil.Timestamp(0)
+	for _, ts := range channelsTs {
+		if ts > maxTs {
+			maxTs = ts
+		}
+	}
+
+	if maxTs == 0 {
+		log.Warn("no channel ts found, use beginTs instead")
+		return beginTs
+	}
+
+	return maxTs
+}
+
 func validateName(entity string, nameType string) error {
 	entity = strings.TrimSpace(entity)