fix UTs

peter-toth · peter-toth · commit 96e54a712d92 · 2019-05-09T11:10:00.000+02:00
Change-Id: I3dcf94e65e79fa43eeb22da79919d49069b4f35d
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala
@@ -180,7 +180,7 @@ class PlannerSuite extends SharedSQLContext {
 
       withTempView("testPushed") {
         val exp = sql("select * from testPushed where key = 15").queryExecution.sparkPlan
-        assert(exp.toString.contains("PushedFilters: [IsNotNull(key), EqualTo(key,15)]"))
+        assert(exp.toString.contains("PushedFilters: [EqualTo(key,15)]"))
       }
     }
   }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileSourceStrategySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileSourceStrategySuite.scala
@@ -197,7 +197,7 @@ class FileSourceStrategySuite extends QueryTest with SharedSQLContext with Predi
         "when checking partition values")
     }
     // Only the filters that do not contain the partition column should be pushed down
-    checkDataFilters(Set(IsNotNull("c1"), EqualTo("c1", 1)))
+    checkDataFilters(Set(EqualTo("c1", 1)))
   }
 
   test("partitioned table - case insensitive") {
@@ -224,7 +224,7 @@ class FileSourceStrategySuite extends QueryTest with SharedSQLContext with Predi
           "when checking partition values")
       }
       // Only the filters that do not contain the partition column should be pushed down
-      checkDataFilters(Set(IsNotNull("c1"), EqualTo("c1", 1)))
+      checkDataFilters(Set(EqualTo("c1", 1)))
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ class PlannerSuite extends SharedSQLContext {`
`180`	`180`
`181`	`181`	`withTempView("testPushed") {`
`182`	`182`	`val exp = sql("select * from testPushed where key = 15").queryExecution.sparkPlan`
`183`		`- assert(exp.toString.contains("PushedFilters: [IsNotNull(key), EqualTo(key,15)]"))`
	`183`	`+ assert(exp.toString.contains("PushedFilters: [EqualTo(key,15)]"))`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ class FileSourceStrategySuite extends QueryTest with SharedSQLContext with Predi`
`197`	`197`	`"when checking partition values")`
`198`	`198`	`}`
`199`	`199`	`// Only the filters that do not contain the partition column should be pushed down`
`200`		`- checkDataFilters(Set(IsNotNull("c1"), EqualTo("c1", 1)))`
	`200`	`+ checkDataFilters(Set(EqualTo("c1", 1)))`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`test("partitioned table - case insensitive") {`
`@@ -224,7 +224,7 @@ class FileSourceStrategySuite extends QueryTest with SharedSQLContext with Predi`
`224`	`224`	`"when checking partition values")`
`225`	`225`	`}`
`226`	`226`	`// Only the filters that do not contain the partition column should be pushed down`
`227`		`- checkDataFilters(Set(IsNotNull("c1"), EqualTo("c1", 1)))`
	`227`	`+ checkDataFilters(Set(EqualTo("c1", 1)))`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`