From f4497a66375531989e4f6c9c7c38457c2753e799 Mon Sep 17 00:00:00 2001 From: Takeshi Yamamuro Date: Tue, 16 Jun 2020 19:37:13 +0900 Subject: [PATCH] fix --- .../spark/sql/catalyst/expressions/predicates.scala | 2 +- .../apache/spark/sql/catalyst/optimizer/Optimizer.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 c9b57367e0f44..05a5ff45b8fb1 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 @@ -211,7 +211,7 @@ trait PredicateHelper extends Logging { * @return the CNF result as sequence of disjunctive expressions. If the number of expressions * exceeds threshold on converting `Or`, `Seq.empty` is returned. */ - def conjunctiveNormalForm(condition: Expression): Seq[Expression] = { + protected def conjunctiveNormalForm(condition: Expression): Seq[Expression] = { val postOrderNodes = postOrderTraversal(condition) val resultStack = new mutable.Stack[Seq[Expression]] val maxCnfNodeCount = SQLConf.get.maxCnfNodeCount diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index 1c3750da0de52..9470c8b97c7a7 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -1341,8 +1341,8 @@ object PushPredicateThroughJoin extends Rule[LogicalPlan] with PredicateHelper { (rightFilterConditions ++ commonFilterCondition). reduceLeftOption(And).map(Filter(_, newJoin)).getOrElse(newJoin) - case jt => - throw new IllegalStateException(s"Unexpected join type: $jt") + case other => + throw new IllegalStateException(s"Unexpected join type: $other") } // push down the join filter into sub query scanning if applicable @@ -1377,8 +1377,8 @@ object PushPredicateThroughJoin extends Rule[LogicalPlan] with PredicateHelper { Join(newLeft, newRight, joinType, newJoinCond, hint) - case jt => - throw new IllegalStateException(s"Unexpected join type: $jt") + case other => + throw new IllegalStateException(s"Unexpected join type: $other") } } }