Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: reuse fm sketch when to analyze (#47268) #49576

Merged
merged 2 commits into from
Dec 19, 2023
Merged

executor: reuse fm sketch when to analyze (#47268) #49576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1537cf3
This is an automated cherry-pick of #47268
hawkingrei Sep 26, 2023
bff520f
update
hawkingrei Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions executor/analyze_col_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ func (e *AnalyzeColumnsExecV2) buildSamplingStats(
mergeResult.collector.Base().Count, e.tableID.TableID, e.tableID.PartitionID, e.tableID.IsPartitionTable(),
"merge subMergeWorker in AnalyzeColumnsExecV2", -1)
e.memTracker.Consume(rootRowCollector.Base().MemSize - oldRootCollectorSize - mergeResult.collector.Base().MemSize)
mergeResult.collector.DestroyAndPutToPool()
}
defer e.memTracker.Release(rootRowCollector.Base().MemSize)
if err != nil {
Expand Down Expand Up @@ -634,6 +635,7 @@ func (e *AnalyzeColumnsExecV2) subMergeWorker(resultCh chan<- *samplingMergeResu
subCollectorSize := subCollector.Base().MemSize
e.memTracker.Consume(newRetCollectorSize - oldRetCollectorSize - subCollectorSize)
e.memTracker.Release(dataSize + colRespSize)
subCollector.DestroyAndPutToPool()
}
resultCh <- &samplingMergeResult{collector: retCollector}
}
Expand Down
17 changes: 17 additions & 0 deletions statistics/row_sampler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type RowSampleCollector interface {
MergeCollector(collector RowSampleCollector)
sampleRow(row []types.Datum, rng *rand.Rand)
Base() *baseCollector
DestroyAndPutToPool()
}

type baseCollector struct {
Expand Down Expand Up @@ -214,6 +215,12 @@ func (s *RowSampleBuilder) Collect() (RowSampleCollector, error) {
}
}

func (s *baseCollector) destroyAndPutToPool() {
for _, sketch := range s.FMSketches {
sketch.DestroyAndPutToPool()
}
}

func (s *baseCollector) collectColumns(sc *stmtctx.StatementContext, cols []types.Datum, sizes []int64) error {
for i, col := range cols {
if col.IsNull() {
Expand Down Expand Up @@ -373,6 +380,11 @@ func (s *ReservoirRowSampleCollector) MergeCollector(subCollector RowSampleColle
}
}

// DestroyAndPutToPool implements the interface RowSampleCollector.
func (s *ReservoirRowSampleCollector) DestroyAndPutToPool() {
s.baseCollector.destroyAndPutToPool()
}

// RowSamplesToProto converts the samp slice to the pb struct.
func RowSamplesToProto(samples WeightedRowSampleHeap) []*tipb.RowSample {
if len(samples) == 0 {
Expand Down Expand Up @@ -456,3 +468,8 @@ func (s *BernoulliRowSampleCollector) MergeCollector(subCollector RowSampleColle
func (s *BernoulliRowSampleCollector) Base() *baseCollector {
return s.baseCollector
}

// DestroyAndPutToPool implements the interface RowSampleCollector.
func (s *BernoulliRowSampleCollector) DestroyAndPutToPool() {
s.baseCollector.destroyAndPutToPool()
}