fixed issue using float, issue #13

rcongiu · Oct 4, 2012 · df0d1f4 · df0d1f4
1 parent 89101b7
commit df0d1f4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.openx.data</groupId>
     <artifactId>json-serde</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <packaging>jar</packaging>
 
     <name>openx-json-serde</name>

diff --git a/src/main/java/org/openx/data/jsonserde/JsonSerDe.java b/src/main/java/org/openx/data/jsonserde/JsonSerDe.java
@@ -46,7 +46,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
 import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo;
 import org.apache.hadoop.io.Text;
-import org.json.JSONArray;
+import org.openx.data.jsonserde.json.JSONArray;
 import org.openx.data.jsonserde.json.JSONException;
 import org.openx.data.jsonserde.json.JSONObject;
 import org.openx.data.jsonserde.objectinspector.JsonObjectInspectorFactory;
@@ -342,7 +342,7 @@ private JSONArray serializeList(Object obj, ListObjectInspector loi) {
             Object element = loi.getListElement(obj, i);
             try {
                 ar.put(i, serializeField(element, loi.getListElementObjectInspector() ) );
-            } catch (org.json.JSONException ex) {
+            } catch (JSONException ex) {
                 LOG.warn("Problem serializing array", ex);
                 throw new RuntimeException(ex);
             }

diff --git a/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorFactory.java b/src/main/java/org/openx/data/jsonserde/objectinspector/JsonObjectInspectorFactory.java
@@ -46,8 +46,11 @@ public static ObjectInspector getJsonObjectInspectorFromTypeInfo(
         if (result == null) {
             switch (typeInfo.getCategory()) {
                 case PRIMITIVE: {
+		    PrimitiveTypeInfo pti = (PrimitiveTypeInfo) typeInfo;
+
                     result = 
-                            getPrimitiveJavaObjectInspector(((PrimitiveTypeInfo) typeInfo).getPrimitiveCategory());
+                            getPrimitiveJavaObjectInspector( pti.getPrimitiveCategory().equals(PrimitiveCategory.FLOAT) ?
+							PrimitiveCategory.DOUBLE : pti.getPrimitiveCategory() );
                     break;
                 }
                 case LIST: {

diff --git a/src/test/scripts/nested_test.sql b/src/test/scripts/nested_test.sql
@@ -1,4 +1,4 @@
-add jar ../../../target/json-serde-1.0-SNAPSHOT-jar-with-dependencies.jar;
+add jar ../../../target/json-serde-1.1.3-jar-with-dependencies.jar;
 
 DROP TABLE json_nested_test;
 CREATE TABLE json_nested_test (