update

Signed-off-by: Weizhen Wang <[email protected]>
pingcap · Apr 22, 2024 · 3e2d5f9 · 3e2d5f9
1 parent 0c52f57
commit 3e2d5f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pkg/planner/core/rule_collect_plan_stats.go b/pkg/planner/core/rule_collect_plan_stats.go
@@ -108,7 +108,7 @@ func RequestLoadStats(ctx base.PlanContext, neededHistItems []model.StatsLoadIte
 			}
 		}
 	})
-	var timeout = time.Duration(syncWait * time.Millisecond.Nanoseconds())
+	var timeout = time.Duration(syncWait * time.Millisecond.Milliseconds())
 	stmtCtx := ctx.GetSessionVars().StmtCtx
 	err := domain.GetDomain(ctx).StatsHandle().SendLoadRequests(stmtCtx, neededHistItems, timeout)
 	if err != nil {

diff --git a/pkg/statistics/handle/syncload/stats_syncload_test.go b/pkg/statistics/handle/syncload/stats_syncload_test.go
@@ -216,12 +216,16 @@ func TestConcurrentLoadHistWithPanicAndFail(t *testing.T) {
 		require.NoError(t, err3)
 		require.Nil(t, task)
 
-		rs1, ok1 := <-stmtCtx1.StatsLoad.ResultCh
-		require.True(t, ok1)
-		require.Equal(t, neededColumns[0].TableItemID, rs1.Item)
-		rs2, ok2 := <-stmtCtx2.StatsLoad.ResultCh
-		require.True(t, ok2)
-		require.Equal(t, neededColumns[0].TableItemID, rs2.Item)
+		for _, resultCh := range stmtCtx1.StatsLoad.ResultCh {
+			rs1, ok1 := <-resultCh
+			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, ok1)
+			require.Equal(t, neededColumns[0].TableItemID, rs1.Val.(stmtctx.StatsLoadResult).Item)
+		}
 
 		stat = h.GetTableStats(tableInfo)
 		hg := stat.Columns[tableInfo.Columns[2].ID].Histogram