fix test framework concerning null tests (#151)

pingcap · Dec 22, 2017 · 2f8265c · 2f8265c
1 parent 477b254
commit 2f8265c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/integtest/src/main/scala/com/pingcap/spark/SparkWrapper.scala b/integtest/src/main/scala/com/pingcap/spark/SparkWrapper.scala
@@ -67,7 +67,9 @@ class SparkWrapper() extends LazyLogging {
     df.collect().map(row => {
       val rowRes = ArrayBuffer.empty[Any]
       for (i <- 0 until row.length) {
-        if (schema(i).dataType.isInstanceOf[BinaryType]) {
+        if (row.get(i) == null) {
+          rowRes += null
+        } else if (schema(i).dataType.isInstanceOf[BinaryType]) {
           rowRes += new String(row.get(i).asInstanceOf[Array[Byte]])
         } else {
           rowRes += toOutput(row.get(i), schema(i).dataType.typeName)

diff --git a/integtest/src/main/scala/com/pingcap/spark/TestCase.scala b/integtest/src/main/scala/com/pingcap/spark/TestCase.scala
@@ -232,28 +232,36 @@ class TestCase(val prop: Properties) extends LazyLogging {
     }
   }
 
+  def checkIgnore(value: Any, str: String): Boolean = {
+    if (value == null) {
+      false
+    } else {
+      value.toString.contains(str)
+    }
+  }
+
   def checkSparkIgnore(tiSpark: List[List[Any]]): Boolean = {
     val ignoreCase = SparkIgnore ++ TiDBIgnore
     tiSpark.exists(
       (row: List[Any]) => row.exists(
         (str: Any) => ignoreCase.exists(
-          (i: String) => str.toString.contains(i)
+          (i: String) => checkIgnore(str, i)
         )))
   }
 
   def checkTiDBIgnore(tiDb: List[List[Any]]): Boolean = {
     tiDb.exists(
       (row: List[Any]) => row.exists(
         (str: Any) => TiDBIgnore.exists(
-          (i: String) => str.toString.contains(i)
+          (i: String) => checkIgnore(str, i)
         )))
   }
 
   def checkSparkJDBCIgnore(sparkJDBC: List[List[Any]]): Boolean = {
     sparkJDBC.exists(
       (row: List[Any]) => row.exists(
         (str: Any) => SparkIgnore.exists(
-          (i: String) => str.toString.contains(i)
+          (i: String) => checkIgnore(str, i)
         )))
   }
 
@@ -612,7 +620,8 @@ class TestCase(val prop: Properties) extends LazyLogging {
 
   private def testSql(dbName: String, sql: String): Unit = {
     spark.init(dbName)
-    execSparkAndShow(sql)
+    spark_jdbc.init(dbName)
+    logger.info(if (execSparkBothAndJudge(sql)) "TEST FAILED." else "TEST PASSED.")
   }
 
   private def test(dbName: String, testCases: ArrayBuffer[(String, String)], compareNeeded: Boolean): Unit = {

diff --git a/src/main/scala/org/apache/spark/sql/TiContext.scala b/src/main/scala/org/apache/spark/sql/TiContext.scala
@@ -15,13 +15,12 @@
 
 package org.apache.spark.sql
 
-
 import com.pingcap.tikv.tools.RegionUtils
-
 import com.pingcap.tikv.{TiConfiguration, TiSession}
 import com.pingcap.tispark._
 import org.apache.spark.SparkConf
 import org.apache.spark.internal.Logging
+
 import scala.collection.JavaConverters._
 
 class TiContext(val session: SparkSession) extends Serializable with Logging {
@@ -35,7 +34,6 @@ class TiContext(val session: SparkSession) extends Serializable with Logging {
 
   TiUtils.sessionInitialize(session, tiSession)
 
-
   final val version: String = TiSparkVersion.version
 
   class DebugTool {