From f26a1f3d3766207595af6cb26d62d54218f5ac1d Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 14 Mar 2019 20:14:31 -0700 Subject: [PATCH] [SPARK-27165][SPARK-27107][BUILD][SQL] Upgrade Apache ORC to 1.5.5 ## What changes were proposed in this pull request? This PR aims to update Apache ORC dependency to fix [SPARK-27107](https://issues.apache.org/jira/browse/SPARK-27107) . ``` [ORC-452] Support converting MAP column from JSON to ORC Improvement [ORC-447] Change the docker scripts to keep a persistent m2 cache [ORC-463] Add `version` command [ORC-475] ORC reader should lazily get filesystem [ORC-476] Make SearchAgument kryo buffer size configurable ``` ## How was this patch tested? Pass the Jenkins with the existing tests. Closes #24096 from dongjoon-hyun/SPARK-27165. Authored-by: Dongjoon Hyun Signed-off-by: Dongjoon Hyun --- dev/deps/spark-deps-hadoop-2.7 | 6 +++--- dev/deps/spark-deps-hadoop-3.1 | 6 +++--- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 877abae446..cd4eed6e29 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -156,9 +156,9 @@ objenesis-2.5.1.jar okhttp-3.8.1.jar okio-1.13.0.jar opencsv-2.3.jar -orc-core-1.5.4-nohive.jar -orc-mapreduce-1.5.4-nohive.jar -orc-shims-1.5.4.jar +orc-core-1.5.5-nohive.jar +orc-mapreduce-1.5.5-nohive.jar +orc-shims-1.5.5.jar oro-2.0.8.jar osgi-resource-locator-1.0.1.jar paranamer-2.8.jar diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index e35690ec40..1f95c67d7a 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -173,9 +173,9 @@ okhttp-2.7.5.jar okhttp-3.8.1.jar okio-1.13.0.jar opencsv-2.3.jar -orc-core-1.5.4-nohive.jar -orc-mapreduce-1.5.4-nohive.jar -orc-shims-1.5.4.jar +orc-core-1.5.5-nohive.jar +orc-mapreduce-1.5.5-nohive.jar +orc-shims-1.5.5.jar oro-2.0.8.jar osgi-resource-locator-1.0.1.jar paranamer-2.8.jar diff --git a/pom.xml b/pom.xml index 405e43fd91..e68d470e55 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 2.1.1 10.12.1.1 1.10.1 - 1.5.4 + 1.5.5 nohive com.twitter 1.6.0