store: key ranges should be sorted in batch cop retry (pingcap#44623) (pingcap#44634)

ti-chi-bot · web-flow · commit 42d2f9fd9b4c · 2023-06-25T03:46:14.000Z
close pingcap#44622
diff --git a/store/copr/batch_coprocessor.go b/store/copr/batch_coprocessor.go
@@ -768,6 +768,10 @@ func (b *batchCopIterator) retryBatchCopTask(ctx context.Context, bo *backoff.Ba
 			ranges = append(ranges, *ran)
 		})
 	}
+	// need to make sure the key ranges is sorted
+	sort.Slice(ranges, func(i, j int) bool {
+		return bytes.Compare(ranges[i].StartKey, ranges[j].StartKey) < 0
+	})
 	return buildBatchCopTasks(bo, b.store, NewKeyRanges(ranges), b.req.StoreType, nil, 0, false, 0)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -768,6 +768,10 @@ func (b batchCopIterator) retryBatchCopTask(ctx context.Context, bo backoff.Ba`
`768`	`768`	`ranges = append(ranges, *ran)`
`769`	`769`	`})`
`770`	`770`	`}`
	`771`	`+ // need to make sure the key ranges is sorted`
	`772`	`+ sort.Slice(ranges, func(i, j int) bool {`
	`773`	`+ return bytes.Compare(ranges[i].StartKey, ranges[j].StartKey) < 0`
	`774`	`+ })`
`771`	`775`	`return buildBatchCopTasks(bo, b.store, NewKeyRanges(ranges), b.req.StoreType, nil, 0, false, 0)`
`772`	`776`	`}`
`773`	`777`