From 896c7b73f0ba1b2d3dccf6fed6410bf077eb3d54 Mon Sep 17 00:00:00 2001
From: yantangzhai <tyz0303@163.com>
Date: Mon, 1 Dec 2014 21:08:41 +0800
Subject: [PATCH] fix NullType MatchError in JavaSchemaRDD when sql has null

---
 .../src/main/scala/org/apache/spark/sql/package.scala  | 10 ++++++++++
 .../spark/sql/types/util/DataTypeConversions.scala     |  1 +
 2 files changed, 11 insertions(+)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/package.scala b/sql/core/src/main/scala/org/apache/spark/sql/package.scala
index 51dad54f1a3f3..1fd8e6220f83b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/package.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/package.scala
@@ -263,6 +263,16 @@ package object sql {
   @DeveloperApi
   val ShortType = catalyst.types.ShortType
 
+  /**
+   * :: DeveloperApi ::
+   *
+   * The data type representing `NULL` values.
+   *
+   * @group dataType
+   */
+  @DeveloperApi
+  val NullType = catalyst.types.NullType
+  
   /**
    * :: DeveloperApi ::
    *
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala b/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
index d4258156f18f6..a6833a9398980 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
@@ -62,6 +62,7 @@ protected[sql] object DataTypeConversions {
     case IntegerType => JDataType.IntegerType
     case LongType => JDataType.LongType
     case ShortType => JDataType.ShortType
+    case NullType => JDataType.StringType
 
     case arrayType: ArrayType => JDataType.createArrayType(
         asJavaDataType(arrayType.elementType), arrayType.containsNull)