Map json to String (#264)

pingcap · Mar 12, 2018 · 5ce1350 · 5ce1350
1 parent 0ef80af
commit 5ce1350
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala b/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala
@@ -61,7 +61,7 @@ class TiStrategy(context: SQLContext) extends Strategy with Logging {
 
   def typeBlackList: TypeBlacklist = {
     val blacklistString =
-      sqlConf.getConfString(TiConfigConst.UNSUPPORTED_TYPES, "time,enum,set,year")
+      sqlConf.getConfString(TiConfigConst.UNSUPPORTED_TYPES, "time,enum,set,year,json")
     new TypeBlacklist(blacklistString)
   }
 

diff --git a/tikv-client/src/main/java/com/pingcap/tikv/types/DataTypeFactory.java b/tikv-client/src/main/java/com/pingcap/tikv/types/DataTypeFactory.java
@@ -24,6 +24,8 @@
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
+import static com.pingcap.tikv.types.MySQLType.TypeJSON;
+
 public class DataTypeFactory {
   private static final Map<MySQLType, Constructor<? extends DataType>> dataTypeCreatorMap;
   private static final Map<MySQLType, DataType> dataTypeInstanceMap;
@@ -43,6 +45,7 @@ public class DataTypeFactory {
     extractTypeMap(EnumType.subTypes, EnumType.class, builder, instBuilder);
     extractTypeMap(SetType.subTypes, SetType.class, builder, instBuilder);
     extractTypeMap(YearType.subTypes, YearType.class, builder, instBuilder);
+    extractTypeMap(new MySQLType[]{MySQLType.TypeJSON}, StringType.class, builder, instBuilder);
     dataTypeCreatorMap = builder.build();
     dataTypeInstanceMap = instBuilder.build();
   }