commit 4edf47ac11897b21a263f53e9c7670c150c06f6d Author: Janaki Lahorani Date: Thu Feb 8 09:19:55 2018 -0800 HIVE-18433: Upgrade Jackson version to 2.9.4 Change-Id: Ibe30f160d42e53a951865c3b1b92e20954acddcd diff --git common/pom.xml common/pom.xml index 4da46f24e7b335f88a812a7d6de4ad94ef307a95..9393d8787adb0f776bf1d3bd0790039d1a24599c 100644 --- common/pom.xml +++ common/pom.xml @@ -250,7 +250,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.new.version} + ${jackson.version} com.github.joshelser diff --git druid-handler/pom.xml druid-handler/pom.xml index b53ddb4a89cd081ea3e5eee89099f8a868e62698..93eb91e1ddf0f7e14db4240745a095e8b426a1ec 100644 --- druid-handler/pom.xml +++ druid-handler/pom.xml @@ -36,6 +36,14 @@ + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + + + com.fasterxml.jackson.core + jackson-databind + org.apache.hive hive-exec diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 2f956b179b31e043d1fd1b1bfe6f19cf6ca28384..0b6dc75703bf0652b29ff5912c624ade572cce03 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -262,7 +262,7 @@ public static String getURL(HttpClient client, URL url) throws IOException { } for (FileStatus fileStatus : fss) { final DataSegment segment = JSON_MAPPER - .readValue(fs.open(fileStatus.getPath()), DataSegment.class); + .readValue((InputStream) fs.open(fileStatus.getPath()), DataSegment.class); publishedSegmentsBuilder.add(segment); } return publishedSegmentsBuilder.build(); diff --git druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java index bb43d512c41a8cd50b13c196f8656b9cfaeab873..898f97a2d56b01acbf2fa2e0232f3fe55223dd79 100644 --- druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java +++ druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java @@ -46,7 +46,8 @@ + "\"descending\":true," + "\"virtualColumns\":[]," + "\"filter\":null," - + "\"granularity\":\"DAY\"," + + "\"granularity\":{\"type\":\"period\",\"period\":\"P1D\",\"timeZone\":" + + "\"America/Los_Angeles\",\"origin\":null}," + "\"aggregations\":[]," + "\"postAggregations\":[]," + "\"context\":null}, [localhost:8082]}]"; @@ -110,7 +111,8 @@ + "\"intervals\":{\"type\":\"LegacySegmentSpec\",\"intervals\":[\"2012-01-01T08:00:00.000Z/2012-01-03T08:00:00.000Z\"]}," + "\"virtualColumns\":[]," + "\"filter\":null," - + "\"granularity\":\"DAY\"," + + "\"granularity\":{\"type\":\"period\",\"period\":\"P1D\",\"timeZone\":" + + "\"America/Los_Angeles\",\"origin\":null}," + "\"dimensions\":[{\"type\":\"LegacyDimensionSpec\",\"dimension\":\"country\",\"outputName\":\"country\",\"outputType\":\"STRING\"}," + "{\"type\":\"LegacyDimensionSpec\",\"dimension\":\"device\",\"outputName\":\"device\",\"outputType\":\"STRING\"}]," + "\"aggregations\":[{\"type\":\"longSum\",\"name\":\"total_usage\",\"fieldName\":\"user_count\",\"expression\":null}," diff --git hcatalog/core/pom.xml hcatalog/core/pom.xml index b0269cd65b931f1e6fd98072d95f264307d32aad..c6831eabe0aa9d60b15415d2900cbf81c2cc9091 100644 --- hcatalog/core/pom.xml +++ hcatalog/core/pom.xml @@ -81,8 +81,18 @@ ${guava.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git hcatalog/server-extensions/pom.xml hcatalog/server-extensions/pom.xml index 797341c881614b2c5c2e31d7b339c9f180e6edd1..c8096e87b31579b4a5b73f4cee1cf3ef981f7506 100644 --- hcatalog/server-extensions/pom.xml +++ hcatalog/server-extensions/pom.xml @@ -52,8 +52,18 @@ ${jms.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git hcatalog/webhcat/svr/pom.xml hcatalog/webhcat/svr/pom.xml index a22bc2243094d8bf89ef0d78ec02a32e15523b0f..615f9c7308e55cf6bbf9a0cbcd6a6d6f2cdf3a27 100644 --- hcatalog/webhcat/svr/pom.xml +++ hcatalog/webhcat/svr/pom.xml @@ -124,13 +124,18 @@ ${zookeeper.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations ${jackson.version} - - org.codehaus.jackson - jackson-mapper-asl + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git itests/hive-blobstore/pom.xml itests/hive-blobstore/pom.xml index fadb4f2dba16f43b145eba727c08de85f15f692d..2f4532786ad9ac6ac1907876d940f4fc19c8e05d 100644 --- itests/hive-blobstore/pom.xml +++ itests/hive-blobstore/pom.xml @@ -233,17 +233,17 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.new.version} + ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.new.version} + ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.new.version} + ${jackson.version} diff --git itests/qtest-druid/pom.xml itests/qtest-druid/pom.xml index 870e3654e603833b114443f4cb0e04a7e8e79802..20b7ea9e3edb396e668f538fa9f1ecc6edf6e96b 100644 --- itests/qtest-druid/pom.xml +++ itests/qtest-druid/pom.xml @@ -171,12 +171,12 @@ com.fasterxml.jackson.core jackson-core - ${jackson.new.version} + ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.new.version} + ${jackson.version} org.apache.hadoop diff --git pom.xml pom.xml index 5be30f669666e85225af32011abb33ddb7c17d53..9dc8050bf348af2a28446f179869ac421384fb98 100644 --- pom.xml +++ pom.xml @@ -155,9 +155,7 @@ 4.5.2 4.4.4 2.4.0 - 1.9.13 - - 2.6.5 + 2.9.4 5.5.23 2.3.4 2.3.1 @@ -617,23 +615,38 @@ ${groovy.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations ${jackson.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core ${jackson.version} - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-databind ${jackson.version} - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.module + jackson-module-scala_${scala.binary.version} + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations ${jackson.version} diff --git ql/pom.xml ql/pom.xml index 1f35bc620bfaf85b9239368d77d36907b203cdbc..31b0a65ed1c2d12a9945ac0a8c1dc756741ceba3 100644 --- ql/pom.xml +++ ql/pom.xml @@ -334,20 +334,25 @@ groovy-all ${groovy.version} - - org.codehaus.jackson - jackson-core-asl - ${jackson.version} - org.jodd jodd-core ${jodd.version} - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} org.datanucleus diff --git ql/src/test/results/clientpositive/druid/druidmini_test1.q.out ql/src/test/results/clientpositive/druid/druidmini_test1.q.out index aa68f48e145d6a743ff23d2705c73c12083d78c7..4a9df6f01d247f8385596da82858335f5252fd66 100644 --- ql/src/test/results/clientpositive/druid/druidmini_test1.q.out +++ ql/src/test/results/clientpositive/druid/druidmini_test1.q.out @@ -114,8 +114,7 @@ FROM druid_table GROUP BY floor_year(`__time`) POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table POSTHOOK: Output: hdfs://### HDFS PATH ### -1968-12-31 16:00:00.0 US/Pacific -4532.57 3660538.8 -4611 3658030 688783835691 8060200254 -1969-12-31 16:00:00.0 US/Pacific -35057.676 2.3648124E7 -35356 4123059 719285966109 2932345033 +1969-01-01 00:00:00.0 US/Pacific -39590.246 2.7308662E7 -39967 7781089 1408069801800 10992545287 PREHOOK: query: EXPLAIN SELECT floor_year(`__time`), MIN(cfloat), MIN(cdouble), MIN(ctinyint), MIN(csmallint),MIN(cint), MIN(cbigint) FROM druid_table GROUP BY floor_year(`__time`) PREHOOK: type: QUERY @@ -150,8 +149,7 @@ FROM druid_table GROUP BY floor_year(`__time`) POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table POSTHOOK: Output: hdfs://### HDFS PATH ### -1968-12-31 16:00:00.0 US/Pacific -1790.778 -308691.84 -1790 -313425 0 -8577981133 -1969-12-31 16:00:00.0 US/Pacific -964.719 -287404.84 -1051 -292138 -1073279343 -2147311592 +1969-01-01 00:00:00.0 US/Pacific -1790.778 -308691.84 -1790 -313425 -1073279343 -8577981133 PREHOOK: query: EXPLAIN SELECT floor_year(`__time`), MAX(cfloat), MAX(cdouble), MAX(ctinyint), MAX(csmallint),MAX(cint), MAX(cbigint) FROM druid_table GROUP BY floor_year(`__time`) PREHOOK: type: QUERY @@ -186,8 +184,7 @@ FROM druid_table GROUP BY floor_year(`__time`) POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table POSTHOOK: Output: hdfs://### HDFS PATH ### -1968-12-31 16:00:00.0 US/Pacific 62.0 57235.0 62 57235 314088763179 2144274348 -1969-12-31 16:00:00.0 US/Pacific 769.164 1.9565518E7 723 57435 319104152611 4923772860 +1969-01-01 00:00:00.0 US/Pacific 769.164 1.9565518E7 723 57435 319104152611 4923772860 PREHOOK: query: EXPLAIN SELECT cstring1, SUM(cdouble) as s FROM druid_table GROUP BY cstring1 ORDER BY s ASC LIMIT 10 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN SELECT cstring1, SUM(cdouble) as s FROM druid_table GROUP BY cstring1 ORDER BY s ASC LIMIT 10 diff --git spark-client/pom.xml spark-client/pom.xml index de6b018800e1ec23d1398312593d765750fc114f..6d95ae46786428f1514b0160941d673803606fc0 100644 --- spark-client/pom.xml +++ spark-client/pom.xml @@ -49,6 +49,10 @@ io.netty netty-all + + com.fasterxml.jackson.module + jackson-module-scala_${scala.binary.version} + org.apache.hive hive-common @@ -77,19 +81,23 @@ org.glassfish.jersey.core * - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + com.fasterxml.jackson.core jackson-databind - + + com.fasterxml.jackson.module + jackson-module-scala_${scala.binary.version} + + junit diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index e5b13bea815706c5896f94406e92e0d332dfb806..00e855d389008f19260dcbd55c8e003e85a1a8be 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -73,7 +73,7 @@ 19.0 3.0.0-beta1 2.6.1 - 2.6.5 + 2.9.4 5.5.1 4.11 0.9.3 @@ -95,7 +95,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.new.version} + ${jackson.version} com.github.joshelser diff --git testutils/ptest2/pom.xml testutils/ptest2/pom.xml index dbcfb010d3a2e0cdc2c23a896541a587a015c7b9..5cd733bcadaae9305a1a95e30ca3e2886eae819b 100644 --- testutils/ptest2/pom.xml +++ testutils/ptest2/pom.xml @@ -31,6 +31,7 @@ limitations under the License. 2.0.0 ${basedir}/../../checkstyle/ 2.12.1 + 2.9.4 @@ -115,9 +116,19 @@ limitations under the License. 1.7 - org.codehaus.jackson - jackson-mapper-asl - 1.9.12 + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} org.slf4j diff --git testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java index 914345267da0e6bf8703d9cae8384fd9c29cbfec..53c8681910564aa25f7782e663936c2e48ef2e26 100644 --- testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java +++ testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java @@ -53,12 +53,12 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.codehaus.jackson.map.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Quick and dirty REST client for the PTest server. It's not expected the scope diff --git testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java index ff1dbd4bafaba9a0e88321c6507a47bbe0421833..61fb2106357283428f3e71ad31a47901d17bc0c8 100644 --- testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java +++ testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java @@ -49,16 +49,16 @@ import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; import org.slf4j.Logger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; class JIRAService { static final int MAX_MESSAGES = 200;