Merge branch 'master' into add-index-clone-dt

pingcap · Dec 1, 2022 · 9a4d264 · 9a4d264
2 parents fd2af9b + 04b676a
commit 9a4d264
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/executor/distsql_test.go b/executor/distsql_test.go
@@ -316,9 +316,8 @@ func TestPartitionTableIndexLookUpReader(t *testing.T) {
 	tk.MustQuery("select * from t where a>=1 and a<15 order by a").Check(testkit.Rows("1 1", "2 2", "11 11", "12 12"))
 	tk.MustQuery("select * from t where a>=1 and a<15 order by a limit 1").Check(testkit.Rows("1 1"))
 	tk.MustQuery("select * from t where a>=1 and a<15 order by a limit 3").Check(testkit.Rows("1 1", "2 2", "11 11"))
-	tk.MustQuery("select * from t where a>=1 and a<15 limit 3").Check(testkit.Rows("1 1", "2 2", "11 11"))
-	tk.MustQuery("select * from t where a between 1 and 15 limit 3").Check(testkit.Rows("1 1", "2 2", "11 11"))
-	tk.MustQuery("select * from t where a between 1 and 15 limit 3 offset 1").Check(testkit.Rows("2 2", "11 11", "12 12"))
+	tk.MustQuery("select * from t where a between 1 and 15 order by a limit 3").Check(testkit.Rows("1 1", "2 2", "11 11"))
+	tk.MustQuery("select * from t where a between 1 and 15 order by a limit 3 offset 1").Check(testkit.Rows("2 2", "11 11", "12 12"))
 }
 
 func TestPartitionTableRandomlyIndexLookUpReader(t *testing.T) {

diff --git a/executor/index_merge_reader.go b/executor/index_merge_reader.go
@@ -950,11 +950,12 @@ func (w *indexMergeProcessWorker) fetchLoopIntersection(ctx context.Context, fet
 		}, w.handleLoopFetcherPanic(ctx, resultCh, "IndexMergeIntersectionProcessWorker", errCh))
 		workers = append(workers, worker)
 	}
+loop:
 	for task := range fetchCh {
 		select {
 		case workers[task.parTblIdx%workerCnt].workerCh <- task:
 		case <-errCh:
-			break
+			break loop
 		}
 	}
 	for _, processWorker := range workers {