Skip to content

Misc code clean up #3150

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
merged 2 commits into from
Aug 11, 2025
Merged

Misc code clean up #3150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5804185
misc code clean up
angelamayxie Aug 11, 2025
c10f948
revert provably change
angelamayxie Aug 11, 2025
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: 1 addition & 1 deletion sql/analyzer/costed_index_scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ func (c *indexCoster) updateBest(s sql.Statistic, hist []sql.HistogramBucket, fd
{
// if no unique keys, prefer equality over ranges
bestConst, bestIsNull := c.getConstAndNullFilters(c.bestFilters)
cmpConst, cmpIsNull := c.getConstAndNullFilters(c.bestFilters)
cmpConst, cmpIsNull := c.getConstAndNullFilters(filters)
if cmpConst.Len() > bestConst.Len() {
update = true
return
Expand Down
12 changes: 3 additions & 9 deletions sql/memo/memo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,14 +400,13 @@ func (m *Memo) OptimizeRoot() error {
// the same subgroup dependencies. After finding the best implementation
// for a particular group, we fix the best plan for that group and recurse
// into its parents.
// TODO: we should not have to cost every plan, sometimes there is a provably
// TODO: we should not have to cost every plan, sometimes there is a probably
// best case implementation
func (m *Memo) optimizeMemoGroup(grp *ExprGroup) error {
if grp.Done {
return nil
}

var err error
n := grp.First
if _, ok := n.(SourceRel); ok {
// We should order the search bottom-up so that physical operators
Expand All @@ -425,7 +424,7 @@ func (m *Memo) optimizeMemoGroup(grp *ExprGroup) error {
for n != nil {
var cost float64
for _, g := range n.Children() {
err = m.optimizeMemoGroup(g)
err := m.optimizeMemoGroup(g)
if err != nil {
return err
}
Expand All @@ -437,15 +436,13 @@ func (m *Memo) optimizeMemoGroup(grp *ExprGroup) error {
}

if grp.RelProps.Distinct.IsHash() {
var dCost float64
if sortedInputs(n) {
n.SetDistinct(SortedDistinctOp)
} else {
n.SetDistinct(HashDistinctOp)
d := &Distinct{Child: grp}
dCost = float64(statsForRel(m.Ctx, d).RowCount())
relCost += float64(statsForRel(m.Ctx, d).RowCount())
}
relCost += dCost
} else {
n.SetDistinct(NoDistinctOp)
}
Expand All @@ -457,9 +454,6 @@ func (m *Memo) optimizeMemoGroup(grp *ExprGroup) error {
}

grp.Done = true
if err != nil {
return err
}
return nil
}

Expand Down
3 changes: 0 additions & 3 deletions sql/rowexec/ddl_iters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,9 +2366,6 @@ func (b *BaseBuilder) executeAlterAutoInc(ctx *sql.Context, n *plan.AlterAutoInc
if !ok {
return plan.ErrInsertIntoNotSupported.New()
}
if err != nil {
return err
}

autoTbl, ok := insertable.(sql.AutoIncrementTable)
if !ok {
Expand Down
Loading