Permalink
Browse files

Merged support for HDP2.3

  • Loading branch information...
rcongiu committed Oct 6, 2015
1 parent e85a7d3 commit 00fb1185ec5c964cd4b22216e54c768be202fb3b
Showing with 12 additions and 65 deletions.
  1. +0 −59 json-serde-hdp23-shim/pom.xml
  2. +10 −3 json-serde/src/test/java/org/openx/data/jsonserde/JsonSerDeTest.java
  3. +2 −3 pom.xml

This file was deleted.

Oops, something went wrong.
@@ -578,9 +578,16 @@ public void testSerializeWithMapping() throws SerDeException, JSONException {
Object obj = serde.serialize(row, soi);
assertTrue(obj instanceof Text);
assertEquals("{\"timestamp\":7898,\"two\":43.2,\"one\":true,\"three\":[],\"four\":\"value1\"}", obj.toString());
System.out.println("Output object " + obj.toString());
String objs = obj.toString();
// this is what we get.. but the order of the elements may vary...
String res = "{\"timestamp\":7898,\"two\":43.2,\"one\":true,\"three\":[],\"four\":\"value1\"}";
String[] r2 = res.substring(1,res.length() - 1).split(",");
// they should be the same...let's hope spacing is the same
assertEquals(objs.length() , res.length() );
for(String s: r2) { assertTrue(objs.contains(s)); }
}
// {"one":true, "timestamp":1234567, "three":["red","yellow",["blue","azure","cobalt","teal"],"orange"],"two":19.5,"four":"poop"}
View
@@ -78,11 +78,11 @@
</activation>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<serde.shim>json-serde-hdp23-shim</serde.shim>
<serde.shim>json-serde-cdh5-shim</serde.shim>
<cdh.version>${hdp23.version}</cdh.version>
<cdh.hive.version>${hdp23.hive.version}</cdh.hive.version>
<cdh.hadoop.version>${hdp23.hadoop.version}</cdh.hadoop.version>
<cdh.shim>hdp23</cdh.shim>
<cdh.shim>cdh5</cdh.shim>
</properties>
</profile>
</profiles>
@@ -91,7 +91,6 @@
<module>json</module>
<module>json-serde-cdh4-shim</module>
<module>json-serde-cdh5-shim</module>
<module>json-serde-hdp23-shim</module>
<module>json-serde</module>
</modules>

0 comments on commit 00fb118

Please sign in to comment.