Skip to content

add TODOs and update simplified Not type (wasn't expecting this branch to merge) #3387

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
angelamayxie merged 1 commit into from
Jan 27, 2026
Merged

add TODOs and update simplified Not type (wasn't expecting this branch to merge) #3387

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
17 changes: 16 additions & 1 deletion sql/analyzer/optimization_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,20 @@ func simplifyFilters(ctx *sql.Context, a *Analyzer, node sql.Node, scope *plan.S

e, same, err := transform.Expr(filter.Expression, func(e sql.Expression) (sql.Expression, transform.TreeIdentity, error) {
switch e := e.(type) {
// TODO: if the left and right children of Equals refer to the same field, simplify to true
case *plan.Subquery:
newQ, same, err := simplifyFilters(ctx, a, e.Query, scope, sel, qFlags)
if same || err != nil {
return e, transform.SameTree, err
}
return e.WithQuery(newQ), transform.NewTree, nil
case *expression.Between:
// TODO: if e.Lower and e.Upper refer to the same field, simplify to Equals(e.Val, e.Lower)
// TODO: if e.Val is the same field as e.Lower and e.Upper, simplify to true

// TODO: Can be evaluated to true/false if e.Val, e.Lower, and e.Upper are all Literals.
// If e.Lower and e.Upper are both Literals:
// If e.Lower > e.Upper, simplify to false. If e.Lower == e.Upper, simplify to Equals(e.Val, e.Lower).
return expression.NewAnd(
expression.NewGreaterThanOrEqual(e.Val, e.Lower),
expression.NewLessThanOrEqual(e.Val, e.Upper),
Expand All @@ -245,10 +252,14 @@ func simplifyFilters(ctx *sql.Context, a *Analyzer, node sql.Node, scope *plan.S
return expression.NewLiteral(true, types.Boolean), transform.NewTree, nil
}

// TODO If e.LeftChild and e.RightChild are both zero literals (false), we simplify to false

// TODO if e.RightChild is not of type Boolean, simplify to IsTrue(e.RightChild)
if isFalse(ctx, e.LeftChild) && types.IsBoolean(e.RightChild.Type()) {
return e.RightChild, transform.NewTree, nil
}

// TODO if e.LeftChild is not of type Boolean, simplify to IsTrue(e.LeftChild)
if isFalse(ctx, e.RightChild) && types.IsBoolean(e.LeftChild.Type()) {
return e.LeftChild, transform.NewTree, nil
}
Expand All @@ -263,10 +274,14 @@ func simplifyFilters(ctx *sql.Context, a *Analyzer, node sql.Node, scope *plan.S
return expression.NewLiteral(false, types.Boolean), transform.NewTree, nil
}

// TODO If e.LeftChild and e.RightChild are both non-zero literals (true), we simplify to true

// TODO if e.RightChild is not of type Boolean, simplify to IsTrue(e.RightChild)
if isTrue(ctx, e.LeftChild) && types.IsBoolean(e.RightChild.Type()) {
return e.RightChild, transform.NewTree, nil
}

// TODO if e.LeftChild is not of type Boolean, simplify to IsTrue(e.LeftChild)
if isTrue(ctx, e.RightChild) && types.IsBoolean(e.LeftChild.Type()) {
return e.LeftChild, transform.NewTree, nil
}
Expand Down Expand Up @@ -333,7 +348,7 @@ func simplifyFilters(ctx *sql.Context, a *Analyzer, node sql.Node, scope *plan.S
// error while converting, keep as is
return e, transform.SameTree, nil
}
return expression.NewLiteral(!val, e.Type()), transform.NewTree, nil
return expression.NewLiteral(!val, types.Boolean), transform.NewTree, nil
}
return e, transform.SameTree, nil
case *expression.Literal, expression.Tuple, *expression.Interval, *expression.CollatedExpression, *expression.MatchAgainst:
Expand Down