increase threshold and test case

apache · Jun 5, 2020 · a9a5c0b · a9a5c0b
1 parent a216cf8
commit a9a5c0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -555,7 +555,7 @@ object SQLConf {
       .intConf
       .checkValue(_ >= 0,
         "The depth of the maximum rewriting conjunction normal form must be positive.")
-      .createWithDefault(20)
+      .createWithDefault(256)
 
   val ESCAPED_STRING_LITERALS = buildConf("spark.sql.parser.escapedStringLiterals")
     .internal()

diff --git a/...catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala b/...catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
@@ -1293,7 +1293,14 @@ class FilterPushdownSuite extends PlanTest {
     val left = testRelation.where(
       ('a === 5 || 'a === 2 || 'a === 1)).subquery('x)
     val right = testRelation.where(
-      ('a >= 2 && 'a <= 3) || ('a >= 1 && 'a <= 14) || ('a >= 9 && 'a <= 27)).subquery('y)
+      ('a >= 2 || 'a >= 1 || 'a >= 9) &&
+        ('a >= 2 || 'a >= 1 || 'a <= 27) &&
+        ('a >= 2 || 'a <=14 || 'a >= 9) &&
+        ('a >= 2 || 'a <=14 || 'a <= 27) &&
+        ('a <= 3 || 'a >= 1 || 'a >= 9) &&
+        ('a <= 3 || 'a >= 1 || 'a <= 27) &&
+        ('a <= 3 || 'a <=14 || 'a >= 9) &&
+        ('a <= 3 || 'a <=14 || 'a <= 27)).subquery('y)
     val correctAnswer = left.join(right, condition = Some(joinCondition)).analyze
 
     comparePlans(optimized, correctAnswer)