update

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

executor/analyze_global_stats.go

@@ -130,12 +130,7 @@ func (e *AnalyzeExec) handleGlobalStats(ctx context.Context, globalStatsMap glob
 		}
 
 		for _, value := range tableAllPartitionStats {
-			for _, col := range value.Columns {
-				col.FMSketch.DestroyAndPutToPool()
-			}
-			for _, idx := range value.Indices {
-				idx.FMSketch.DestroyAndPutToPool()
-			}
+			value.ReleaseAndPutToPool()
 		}
 	}
 

statistics/handle/globalstats/global_stats.go

@@ -93,6 +93,17 @@ func (g *GlobalStatusHandler) MergePartitionStats2GlobalStats(
 	loadTablePartitionStatsFn loadTablePartitionStatsFunc,
 ) (globalStats *GlobalStats, err error) {
 	partitionNum := len(globalTableInfo.Partition.Definitions)
+<<<<<<< HEAD
+=======
+	externalCache := false
+	if allPartitionStats == nil {
+		allPartitionStats = make(map[int64]*statistics.Table)
+	} else {
+		externalCache = true
+	}
+	// initialized the globalStats
+	globalStats = new(GlobalStats)
+>>>>>>> 2d79e445e2 (update)
 	if len(histIDs) == 0 {
 		for _, col := range globalTableInfo.Columns {
 			// The virtual generated column stats can not be merged to the global stats.
@@ -133,11 +144,16 @@ func (g *GlobalStatusHandler) MergePartitionStats2GlobalStats(
 
 		tableInfo := partitionTable.Meta()
 		var partitionStats *statistics.Table
+<<<<<<< HEAD
 		if allPartitionStats != nil {
 			partitionStats, ok = allPartitionStats[partitionID]
 		}
 
 		// If preload partition stats isn't provided, then we load partition stats directly and set it into allPartitionStats.
+=======
+		partitionStats, ok = allPartitionStats[partitionID]
+		// If pre-load partition stats isn't provided, then we load partition stats directly and set it into allPartitionStats
+>>>>>>> 2d79e445e2 (update)
 		if allPartitionStats == nil || partitionStats == nil || !ok {
 			var err1 error
 			partitionStats, err1 = loadTablePartitionStatsFn(tableInfo, &def)
@@ -149,9 +165,6 @@ func (g *GlobalStatusHandler) MergePartitionStats2GlobalStats(
 				err = err1
 				return
 			}
-			if allPartitionStats == nil {
-				allPartitionStats = make(map[int64]*statistics.Table)
-			}
 			allPartitionStats[partitionID] = partitionStats
 		}
 
@@ -259,7 +272,11 @@ func (g *GlobalStatusHandler) MergePartitionStats2GlobalStats(
 		}
 		globalStats.Hg[i].NDV = globalStatsNDV
 	}
-
+	if !externalCache {
+		for _, value := range allPartitionStats {
+			value.ReleaseAndPutToPool()
+		}
+	}
 	return
 }
 

statistics/table.go

@@ -505,6 +505,16 @@ func (t *Table) IsOutdated() bool {
 	return false
 }
 
+// ReleaseAndPutToPool releases data strucutres of Table and put itself back to pool.
+func (t *Table) ReleaseAndPutToPool() {
+	for _, col := range t.Columns {
+		col.FMSketch.DestroyAndPutToPool()
+	}
+	for _, idx := range t.Indices {
+		idx.FMSketch.DestroyAndPutToPool()
+	}
+}
+
 // ID2UniqueID generates a new HistColl whose `Columns` is built from UniqueID of given columns.
 func (coll *HistColl) ID2UniqueID(columns []*expression.Column) *HistColl {
 	cols := make(map[int64]*Column)