Skip to content

executor: minor cleanup in builder.go #61924

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

Merged
ti-chi-bot merged 1 commit into from
Jun 23, 2025
Merged

executor: minor cleanup in builder.go #61924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 7 additions & 15 deletions pkg/executor/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,11 +1467,9 @@ func (us *UnionScanExec) handleCachedTable(b *executorBuilder, x bypassDataSourc
us.cacheTable = cacheData
} else if loading {
return
} else {
if !b.inUpdateStmt && !b.inDeleteStmt && !b.inInsertStmt && !vars.StmtCtx.InExplainStmt {
store := b.ctx.GetStore()
cachedTable.UpdateLockForRead(context.Background(), store, startTS, leaseDuration)
}
} else if !b.inUpdateStmt && !b.inDeleteStmt && !b.inInsertStmt && !vars.StmtCtx.InExplainStmt {
store := b.ctx.GetStore()
cachedTable.UpdateLockForRead(context.Background(), store, startTS, leaseDuration)
}
}
}
Expand Down Expand Up @@ -1961,10 +1959,8 @@ func (b *executorBuilder) buildHashAggFromChildExec(childExec exec.Executor, v *
// 1 row in set (0.00 sec)
if len(v.GroupByItems) != 0 || aggregation.IsAllFirstRow(v.AggFuncs) {
e.DefaultVal = nil
} else {
if v.IsFinalAgg() {
e.DefaultVal = e.AllocPool.Alloc(exec.RetTypes(e), 1, 1)
}
} else if v.IsFinalAgg() {
e.DefaultVal = e.AllocPool.Alloc(exec.RetTypes(e), 1, 1)
}
for _, aggDesc := range v.AggFuncs {
if aggDesc.HasDistinct || len(aggDesc.OrderByItems) > 0 {
Expand Down Expand Up @@ -5635,14 +5631,10 @@ func (b *executorBuilder) buildCTE(v *plannercore.PhysicalCTE) exec.Executor {

chkSize := b.ctx.GetSessionVars().MaxChunkSize
// iterOutTbl will be constructed in CTEExec.Open().
var resTbl cteutil.Storage
var iterInTbl cteutil.Storage
var producer *cteProducer
storages, ok := storageMap[v.CTE.IDForStorage]
if ok {
// Storage already setup.
resTbl = storages.ResTbl
iterInTbl = storages.IterInTbl
producer = storages.Producer
} else {
if v.SeedPlan == nil {
Expand All @@ -5658,12 +5650,12 @@ func (b *executorBuilder) buildCTE(v *plannercore.PhysicalCTE) exec.Executor {

// Setup storages.
tps := seedExec.RetFieldTypes()
resTbl = cteutil.NewStorageRowContainer(tps, chkSize)
resTbl := cteutil.NewStorageRowContainer(tps, chkSize)
if err := resTbl.OpenAndRef(); err != nil {
b.err = err
return nil
}
iterInTbl = cteutil.NewStorageRowContainer(tps, chkSize)
iterInTbl := cteutil.NewStorageRowContainer(tps, chkSize)
if err := iterInTbl.OpenAndRef(); err != nil {
b.err = err
return nil
Expand Down