update

Signed-off-by: Weizhen Wang <[email protected]>

pkg/statistics/handle/syncload/stats_syncload.go

@@ -32,6 +32,7 @@ import (
 	statstypes "github.com/pingcap/tidb/pkg/statistics/handle/types"
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/pkg/util"
+	"github.com/pingcap/tidb/pkg/util/intest"
 	"github.com/pingcap/tidb/pkg/util/logutil"
 	"go.uber.org/zap"
 )
@@ -224,20 +225,21 @@ func (s *statsSyncLoad) HandleOneTask(sctx sessionctx.Context, lastTask *statsty
 		task = lastTask
 	}
 	resultChan := s.StatsLoad.Singleflight.DoChan(task.Item.Key(), func() (any, error) {
-		return s.handleOneItemTask(sctx, task)
+		result, err := s.handleOneItemTask(sctx, task)
+		intest.Assert(result != nil)
+		return result, err
 	})
 	timeout := time.Until(task.ToTimeout)
 	select {
 	case result := <-resultChan:
+		slr := result.Val.(*stmtctx.StatsLoadResult)
 		if result.Err == nil {
 			// result.Val is nil means the task doesn't update. so we don't need to send the result to the channel.
-			slr := result.Val.(*stmtctx.StatsLoadResult)
 			task.ResultCh <- *slr
 			return nil, nil
 		}
 		if !updateNeededItemTaskRetryCountAndCheck(task) {
 			// result.Val is nil means the task doesn't update. so we don't need to send the result to the channel.
-			slr := result.Val.(*stmtctx.StatsLoadResult)
 			slr.Error = result.Err
 			task.ResultCh <- *slr
 			return nil, nil
@@ -302,10 +304,8 @@ func (s *statsSyncLoad) handleOneItemTask(sctx sessionctx.Context, task *statsty
 				Histogram:  *statistics.NewHistogram(item.ID, 0, 0, 0, &wrapper.colInfo.FieldType, 0, 0),
 				IsHandle:   tbl.IsPkIsHandle && mysql.HasPriKeyFlag(wrapper.colInfo.GetFlag()),
 			}
-			if s.updateCachedItem(item, wrapper.col, wrapper.idx, task.Item.FullLoad) {
-				return result, nil
-			}
-			return nil, nil
+			s.updateCachedItem(item, wrapper.col, wrapper.idx, task.Item.FullLoad)
+			return result, nil
 		}
 	}
 	t := time.Now()
@@ -325,10 +325,10 @@ func (s *statsSyncLoad) handleOneItemTask(sctx sessionctx.Context, task *statsty
 		}
 	}
 	metrics.ReadStatsHistogram.Observe(float64(time.Since(t).Milliseconds()))
-	if needUpdate && s.updateCachedItem(item, wrapper.col, wrapper.idx, task.Item.FullLoad) {
-		return result, nil
+	if needUpdate {
+		s.updateCachedItem(item, wrapper.col, wrapper.idx, task.Item.FullLoad)
 	}
-	return nil, nil
+	return result, nil
 }
 
 // readStatsForOneItem reads hist for one column/index, TODO load data via kv-get asynchronously