Skip to content

Commit

Permalink
update failed test cases
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiangxb1987
jiangxb1987 committed Jun 21, 2017
1 parent f44d38b commit 61b3799
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
57 changes: 29 additions & 28 deletions ...t/src/test/scala/org/apache/spark/sql/catalyst/optimizer/BooleanSimplificationSuite.scala
View file
Expand Up @@ -41,7 +41,8 @@ class BooleanSimplificationSuite extends PlanTest with PredicateHelper {
PruneFilters) :: Nil
}

val testRelation = LocalRelation('a.int, 'b.int, 'c.int, 'd.string)
val testRelation = LocalRelation('a.int, 'b.int, 'c.int, 'd.string,
'e.boolean, 'f.boolean, 'g.boolean, 'h.boolean)

val testRelationWithData = LocalRelation.fromExternalRows(
testRelation.output, Seq(Row(1, 2, 3, "abc"))
Expand Down Expand Up @@ -101,52 +102,52 @@ class BooleanSimplificationSuite extends PlanTest with PredicateHelper {
'a === 'b || 'b > 3 && 'a > 3 && 'a < 5)
}

test("a && (!a || b)") {
checkCondition('a && (!'a || 'b ), 'a && 'b)
test("e && (!e || f)") {
checkCondition('e && (!'e || 'f ), 'e && 'f)

checkCondition('a && ('b || !'a ), 'a && 'b)
checkCondition('e && ('f || !'e ), 'e && 'f)

checkCondition((!'a || 'b ) && 'a, 'b && 'a)
checkCondition((!'e || 'f ) && 'e, 'f && 'e)

checkCondition(('b || !'a ) && 'a, 'b && 'a)
checkCondition(('f || !'e ) && 'e, 'f && 'e)
}

test("a < 1 && (!(a < 1) || b)") {
checkCondition('a < 1 && (!('a < 1) || 'b), ('a < 1) && 'b)
checkCondition('a < 1 && ('b || !('a < 1)), ('a < 1) && 'b)
test("a < 1 && (!(a < 1) || f)") {
checkCondition('a < 1 && (!('a < 1) || 'f), ('a < 1) && 'f)
checkCondition('a < 1 && ('f || !('a < 1)), ('a < 1) && 'f)

checkCondition('a <= 1 && (!('a <= 1) || 'b), ('a <= 1) && 'b)
checkCondition('a <= 1 && ('b || !('a <= 1)), ('a <= 1) && 'b)
checkCondition('a <= 1 && (!('a <= 1) || 'f), ('a <= 1) && 'f)
checkCondition('a <= 1 && ('f || !('a <= 1)), ('a <= 1) && 'f)

checkCondition('a > 1 && (!('a > 1) || 'b), ('a > 1) && 'b)
checkCondition('a > 1 && ('b || !('a > 1)), ('a > 1) && 'b)
checkCondition('a > 1 && (!('a > 1) || 'f), ('a > 1) && 'f)
checkCondition('a > 1 && ('f || !('a > 1)), ('a > 1) && 'f)

checkCondition('a >= 1 && (!('a >= 1) || 'b), ('a >= 1) && 'b)
checkCondition('a >= 1 && ('b || !('a >= 1)), ('a >= 1) && 'b)
checkCondition('a >= 1 && (!('a >= 1) || 'f), ('a >= 1) && 'f)
checkCondition('a >= 1 && ('f || !('a >= 1)), ('a >= 1) && 'f)
}

test("a < 1 && ((a >= 1) || b)") {
checkCondition('a < 1 && ('a >= 1 || 'b ), ('a < 1) && 'b)
checkCondition('a < 1 && ('b || 'a >= 1), ('a < 1) && 'b)
test("a < 1 && ((a >= 1) || f)") {
checkCondition('a < 1 && ('a >= 1 || 'f ), ('a < 1) && 'f)
checkCondition('a < 1 && ('f || 'a >= 1), ('a < 1) && 'f)

checkCondition('a <= 1 && ('a > 1 || 'b ), ('a <= 1) && 'b)
checkCondition('a <= 1 && ('b || 'a > 1), ('a <= 1) && 'b)
checkCondition('a <= 1 && ('a > 1 || 'f ), ('a <= 1) && 'f)
checkCondition('a <= 1 && ('f || 'a > 1), ('a <= 1) && 'f)

checkCondition('a > 1 && (('a <= 1) || 'b), ('a > 1) && 'b)
checkCondition('a > 1 && ('b || ('a <= 1)), ('a > 1) && 'b)
checkCondition('a > 1 && (('a <= 1) || 'f), ('a > 1) && 'f)
checkCondition('a > 1 && ('f || ('a <= 1)), ('a > 1) && 'f)

checkCondition('a >= 1 && (('a < 1) || 'b), ('a >= 1) && 'b)
checkCondition('a >= 1 && ('b || ('a < 1)), ('a >= 1) && 'b)
checkCondition('a >= 1 && (('a < 1) || 'f), ('a >= 1) && 'f)
checkCondition('a >= 1 && ('f || ('a < 1)), ('a >= 1) && 'f)
}

test("DeMorgan's law") {
checkCondition(!('a && 'b), !'a || !'b)
checkCondition(!('e && 'f), !'e || !'f)

checkCondition(!('a || 'b), !'a && !'b)
checkCondition(!('e || 'f), !'e && !'f)

checkCondition(!(('a && 'b) || ('c && 'd)), (!'a || !'b) && (!'c || !'d))
checkCondition(!(('e && 'f) || ('g && 'h)), (!'e || !'f) && (!'g || !'h))

checkCondition(!(('a || 'b) && ('c || 'd)), (!'a && !'b) || (!'c && !'d))
checkCondition(!(('e || 'f) && ('g || 'h)), (!'e && !'f) || (!'g && !'h))
}

private val caseInsensitiveConf = new SQLConf().copy(SQLConf.CASE_SENSITIVE -> false)
Expand Down
9 changes: 4 additions & 5 deletions ...yst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ConstantPropagationSuite.scala
View file
Expand Up @@ -35,17 +35,16 @@ class ConstantPropagationSuite extends PlanTest {
Batch("AnalysisNodes", Once,
EliminateSubqueryAliases) ::
Batch("ConstantPropagation", FixedPoint(10),
ColumnPruning,
ConstantPropagation,
ConstantFolding,
BooleanSimplification) :: Nil
}

val testRelation = LocalRelation('a.int, 'b.int, 'c.int)

private val columnA = 'a.int
private val columnB = 'b.int
private val columnC = 'c.int
private val columnA = 'a
private val columnB = 'b
private val columnC = 'c

test("basic test") {
val query = testRelation
Expand Down Expand Up @@ -160,7 +159,7 @@ class ConstantPropagationSuite extends PlanTest {

val correctAnswer = testRelation
.select(columnA)
.where(columnA === Literal(1) && columnA === Literal(2) && columnB === Literal(5))
.where(columnA === Literal(1) && columnA === Literal(2) && columnB === Literal(5)).analyze

comparePlans(Optimize.execute(query.analyze), correctAnswer)
}
Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala
View file
Expand Up @@ -18,7 +18,7 @@
package org.apache.spark.sql.catalyst.parser

import org.apache.spark.sql.catalyst.{FunctionIdentifier, TableIdentifier}
import org.apache.spark.sql.catalyst.analysis.{UnresolvedAttribute, UnresolvedFunction, UnresolvedGenerator, UnresolvedInlineTable, UnresolvedRelation, UnresolvedTableValuedFunction}
import org.apache.spark.sql.catalyst.analysis.{AnalysisTest, UnresolvedAttribute, UnresolvedFunction, UnresolvedGenerator, UnresolvedInlineTable, UnresolvedRelation, UnresolvedTableValuedFunction}
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical._
Expand All @@ -29,7 +29,7 @@ import org.apache.spark.sql.types.IntegerType
*
* There is also SparkSqlParserSuite in sql/core module for parser rules defined in sql/core module.
*/
class PlanParserSuite extends PlanTest {
class PlanParserSuite extends AnalysisTest {
import CatalystSqlParser._
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
Expand Down

0 comments on commit 61b3799

Please sign in to comment.