update

Signed-off-by: Weizhen Wang <[email protected]>
pingcap · Apr 22, 2024 · fe5cf09 · fe5cf09
1 parent 15cd53d
commit fe5cf09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/statistics/handle/syncload/stats_syncload.go b/pkg/statistics/handle/syncload/stats_syncload.go
@@ -79,7 +79,7 @@ func (s *statsSyncLoad) SendLoadRequests(sc *stmtctx.StatementContext, neededHis
 	}
 	sc.StatsLoad.Timeout = timeout
 	sc.StatsLoad.NeededItems = remainedItems
-	sc.StatsLoad.ResultCh = make([]<-chan singleflight.Result, len(remainedItems))
+	sc.StatsLoad.ResultCh = make([]<-chan singleflight.Result, 0, len(remainedItems))
 	timer := time.NewTimer(timeout)
 	defer timer.Stop()
 	for _, item := range remainedItems {

diff --git a/pkg/statistics/handle/syncload/stats_syncload_test.go b/pkg/statistics/handle/syncload/stats_syncload_test.go
@@ -211,18 +211,15 @@ func TestConcurrentLoadHistWithPanicAndFail(t *testing.T) {
 		task3, err3 := h.HandleOneTask(testKit.Session().(sessionctx.Context), task1, exitCh)
 		require.NoError(t, err3)
 		require.Nil(t, task3)
-
-		task, err3 := h.HandleOneTask(testKit.Session().(sessionctx.Context), nil, exitCh)
-		require.NoError(t, err3)
-		require.Nil(t, task)
-
 		for _, resultCh := range stmtCtx1.StatsLoad.ResultCh {
 			rs1, ok1 := <-resultCh
+			require.True(t, rs1.Shared)
 			require.True(t, ok1)
 			require.Equal(t, neededColumns[0].TableItemID, rs1.Val.(stmtctx.StatsLoadResult).Item)
 		}
 		for _, resultCh := range stmtCtx2.StatsLoad.ResultCh {
 			rs1, ok1 := <-resultCh
+			require.True(t, rs1.Shared)
 			require.True(t, ok1)
 			require.Equal(t, neededColumns[0].TableItemID, rs1.Val.(stmtctx.StatsLoadResult).Item)
 		}