Skip to content

[SPARK-41520][SQL] Split AND_OR TreePattern to separate AND and OR TreePatterns #39064

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

Closed
kelvinjian-db wants to merge 1 commit into from
Closed

[SPARK-41520][SQL] Split AND_OR TreePattern to separate AND and OR TreePatterns #39064

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ case class And(left: Expression, right: Expression) extends BinaryOperator with

override def sqlOperator: String = "AND"

final override val nodePatterns: Seq[TreePattern] = Seq(AND_OR)
final override val nodePatterns: Seq[TreePattern] = Seq(AND)

// +---------+---------+---------+---------+
// | AND | TRUE | FALSE | UNKNOWN |
Expand Down Expand Up @@ -841,7 +841,7 @@ case class Or(left: Expression, right: Expression) extends BinaryOperator with P

override def sqlOperator: String = "OR"

final override val nodePatterns: Seq[TreePattern] = Seq(AND_OR)
final override val nodePatterns: Seq[TreePattern] = Seq(OR)

// +---------+---------+---------+---------+
// | OR | TRUE | FALSE | UNKNOWN |
Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ object OptimizeIn extends Rule[LogicalPlan] {
*/
object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
def apply(plan: LogicalPlan): LogicalPlan = plan.transformWithPruning(
_.containsAnyPattern(AND_OR, NOT), ruleId) {
_.containsAnyPattern(AND, OR, NOT), ruleId) {
case q: LogicalPlan => q.transformExpressionsUpWithPruning(
_.containsAnyPattern(AND_OR, NOT), ruleId) {
_.containsAnyPattern(AND, OR, NOT), ruleId) {
case TrueLiteral And e => e
case e And TrueLiteral => e
case FalseLiteral Or e => e
Expand Down
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreePatterns.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object TreePattern extends Enumeration {
// Expression patterns (alphabetically ordered)
val AGGREGATE_EXPRESSION = Value(0)
val ALIAS: Value = Value
val AND_OR: Value = Value
val AND: Value = Value
val ARRAYS_ZIP: Value = Value
val ATTRIBUTE_REFERENCE: Value = Value
val APPEND_COLUMNS: Value = Value
Expand Down Expand Up @@ -70,6 +70,7 @@ object TreePattern extends Enumeration {
val NULL_CHECK: Value = Value
val NULL_LITERAL: Value = Value
val SERIALIZE_FROM_OBJECT: Value = Value
val OR: Value = Value
val OUTER_REFERENCE: Value = Value
val PIVOT: Value = Value
val PLAN_EXPRESSION: Value = Value
Expand Down