From 63df6ca258498fb58340f98ddc12ca209ae5126c Mon Sep 17 00:00:00 2001 From: Yingyi Bu Date: Thu, 22 Apr 2021 11:58:05 -0700 Subject: [PATCH] mark a few nodePatterns as finals --- .../spark/sql/catalyst/expressions/predicates.scala | 10 +++++----- .../sql/catalyst/expressions/regexpExpressions.scala | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala index 6077be23939cf..ad04c82795ba8 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala @@ -309,7 +309,7 @@ case class Not(child: Expression) override def inputTypes: Seq[DataType] = Seq(BooleanType) - override val nodePatterns: Seq[TreePattern] = Seq(NOT) + final override val nodePatterns: Seq[TreePattern] = Seq(NOT) // +---------+-----------+ // | CHILD | NOT CHILD | @@ -436,7 +436,7 @@ case class In(value: Expression, list: Seq[Expression]) extends Predicate { override def nullable: Boolean = children.exists(_.nullable) override def foldable: Boolean = children.forall(_.foldable) - override val nodePatterns: Seq[TreePattern] = Seq(IN) + final override val nodePatterns: Seq[TreePattern] = Seq(IN) override def toString: String = s"$value IN ${list.mkString("(", ",", ")")}" @@ -549,7 +549,7 @@ case class InSet(child: Expression, hset: Set[Any]) extends UnaryExpression with override def nullable: Boolean = child.nullable || hasNull - override val nodePatterns: Seq[TreePattern] = Seq(INSET) + final override val nodePatterns: Seq[TreePattern] = Seq(INSET) protected override def nullSafeEval(value: Any): Any = { if (set.contains(value)) { @@ -667,7 +667,7 @@ case class And(left: Expression, right: Expression) extends BinaryOperator with override def sqlOperator: String = "AND" - override val nodePatterns: Seq[TreePattern] = Seq(AND_OR) + final override val nodePatterns: Seq[TreePattern] = Seq(AND_OR) // +---------+---------+---------+---------+ // | AND | TRUE | FALSE | UNKNOWN | @@ -755,7 +755,7 @@ case class Or(left: Expression, right: Expression) extends BinaryOperator with P override def sqlOperator: String = "OR" - override val nodePatterns: Seq[TreePattern] = Seq(AND_OR) + final override val nodePatterns: Seq[TreePattern] = Seq(AND_OR) // +---------+---------+---------+---------+ // | OR | TRUE | FALSE | UNKNOWN | diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala index 6c5c6b504c415..57d7d76268795 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala @@ -130,7 +130,7 @@ case class Like(left: Expression, right: Expression, escapeChar: Char) override def matches(regex: Pattern, str: String): Boolean = regex.matcher(str).matches() - override val nodePatterns: Seq[TreePattern] = Seq(LIKE_FAMLIY) + final override val nodePatterns: Seq[TreePattern] = Seq(LIKE_FAMLIY) override def toString: String = escapeChar match { case '\\' => s"$left LIKE $right" @@ -201,7 +201,7 @@ sealed abstract class MultiLikeBase override def nullable: Boolean = true - override val nodePatterns: Seq[TreePattern] = Seq(LIKE_FAMLIY) + final override val nodePatterns: Seq[TreePattern] = Seq(LIKE_FAMLIY) protected lazy val hasNull: Boolean = patterns.contains(null)