code style

apache · Feb 28, 2018 · b3f2ade · b3f2ade
1 parent f7d764e
commit b3f2ade
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/...yst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/QueryPlanConstraints.scala b/...yst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/QueryPlanConstraints.scala
@@ -23,18 +23,24 @@ import org.apache.spark.sql.catalyst.expressions._
 trait QueryPlanConstraints { self: LogicalPlan =>
 
   /**
-    * An [[ExpressionSet]] that contains an additional set of constraints about equality
-    * constraints and `isNotNull` constraints.
-    */
-  lazy val allConstraints: ExpressionSet = ExpressionSet(validConstraints
-    .union(inferAdditionalConstraints(validConstraints))
-    .union(constructIsNotNullConstraints(validConstraints)))
+   * An [[ExpressionSet]] that contains an additional set of constraints about equality
+   * constraints and `isNotNull` constraints.
+   */
+  lazy val allConstraints: ExpressionSet = {
+    if (conf.constraintPropagationEnabled) {
+      ExpressionSet(validConstraints
+        .union(inferAdditionalConstraints(validConstraints))
+        .union(constructIsNotNullConstraints(validConstraints)))
+    } else {
+      ExpressionSet(Set.empty)
+    }
+  }
 
   /**
-    * An [[ExpressionSet]] that contains invariants about the rows output by this operator. For
-    * example, if this set contains the expression `a = 2` then that expression is guaranteed to
-    * evaluate to `true` for all rows produced.
-    */
+   * An [[ExpressionSet]] that contains invariants about the rows output by this operator. For
+   * example, if this set contains the expression `a = 2` then that expression is guaranteed to
+   * evaluate to `true` for all rows produced.
+   */
   lazy val constraints: ExpressionSet = {
     if (conf.constraintPropagationEnabled) {
       ExpressionSet(allConstraints.filter { c =>

diff --git a/...test/scala/org/apache/spark/sql/catalyst/optimizer/InferFiltersFromConstraintsSuite.scala b/...test/scala/org/apache/spark/sql/catalyst/optimizer/InferFiltersFromConstraintsSuite.scala
@@ -193,7 +193,7 @@ class InferFiltersFromConstraintsSuite extends PlanTest {
     comparePlans(Optimize.execute(original.analyze), correct.analyze)
   }
 
-  test("single left-semi join: filter out nulls on either side on equi-join keys") {
+  test("SPARK-23405:single left-semi join, filter out nulls on either side on equi-join keys") {
     val x = testRelation.subquery('x)
     val y = testRelation.subquery('y)
     val originalQuery = x.join(y, LeftSemi,