Skip to content

Commit 2fd15a2

Browse files
committed
[SPARK-30695][BUILD] Upgrade Apache ORC to 1.5.9
### What changes were proposed in this pull request? This PR aims to upgrade to Apache ORC 1.5.9. - For `hive-2.3` profile, we need to upgrade `hive-storage-api` from `2.6.0` to `2.7.1`. - For `hive-1.2` profile, ORC library with classifier `nohive` already shaded it. So, there is no change. ### Why are the changes needed? This will bring the latest bug fixes. The following is the full release note. - https://issues.apache.org/jira/projects/ORC/versions/12346546 ### Does this PR introduce any user-facing change? No. ### How was this patch tested? Pass the Jenkins with the existing tests. Here is the summary. 1. `Hive 1.2 + Hadoop 2.7` passed. ([here](apache#27421 (comment))) 2. `Hive 2.3 + Hadoop 2.7` passed. ([here](apache#27421 (comment))) Closes apache#27421 from dongjoon-hyun/SPARK-ORC-1.5.9. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 82b4f75 commit 2fd15a2

5 files changed

+19
-13
lines changed

LICENSE-binary

+1
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ xmlenc:xmlenc
469469
net.sf.py4j:py4j
470470
org.jpmml:pmml-model
471471
org.jpmml:pmml-schema
472+
org.threeten:threeten-extra
472473

473474
python/lib/py4j-*-src.zip
474475
python/pyspark/cloudpickle.py

dev/deps/spark-deps-hadoop-2.7-hive-1.2

+4-3
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ objenesis/2.5.1//objenesis-2.5.1.jar
160160
okhttp/3.12.6//okhttp-3.12.6.jar
161161
okio/1.15.0//okio-1.15.0.jar
162162
opencsv/2.3//opencsv-2.3.jar
163-
orc-core/1.5.8/nohive/orc-core-1.5.8-nohive.jar
164-
orc-mapreduce/1.5.8/nohive/orc-mapreduce-1.5.8-nohive.jar
165-
orc-shims/1.5.8//orc-shims-1.5.8.jar
163+
orc-core/1.5.9/nohive/orc-core-1.5.9-nohive.jar
164+
orc-mapreduce/1.5.9/nohive/orc-mapreduce-1.5.9-nohive.jar
165+
orc-shims/1.5.9//orc-shims-1.5.9.jar
166166
oro/2.0.8//oro-2.0.8.jar
167167
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
168168
paranamer/2.8//paranamer-2.8.jar
@@ -198,6 +198,7 @@ stax-api/1.0.1//stax-api-1.0.1.jar
198198
stream/2.9.6//stream-2.9.6.jar
199199
stringtemplate/3.2.1//stringtemplate-3.2.1.jar
200200
super-csv/2.2.0//super-csv-2.2.0.jar
201+
threeten-extra/1.5.0//threeten-extra-1.5.0.jar
201202
univocity-parsers/2.8.3//univocity-parsers-2.8.3.jar
202203
xbean-asm7-shaded/4.15//xbean-asm7-shaded-4.15.jar
203204
xercesImpl/2.9.1//xercesImpl-2.9.1.jar

dev/deps/spark-deps-hadoop-2.7-hive-2.3

+5-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ hive-shims-0.23/2.3.6//hive-shims-0.23-2.3.6.jar
9292
hive-shims-common/2.3.6//hive-shims-common-2.3.6.jar
9393
hive-shims-scheduler/2.3.6//hive-shims-scheduler-2.3.6.jar
9494
hive-shims/2.3.6//hive-shims-2.3.6.jar
95-
hive-storage-api/2.6.0//hive-storage-api-2.6.0.jar
95+
hive-storage-api/2.7.1//hive-storage-api-2.7.1.jar
9696
hive-vector-code-gen/2.3.6//hive-vector-code-gen-2.3.6.jar
9797
hk2-api/2.6.1//hk2-api-2.6.1.jar
9898
hk2-locator/2.6.1//hk2-locator-2.6.1.jar
@@ -176,9 +176,9 @@ objenesis/2.5.1//objenesis-2.5.1.jar
176176
okhttp/3.12.6//okhttp-3.12.6.jar
177177
okio/1.15.0//okio-1.15.0.jar
178178
opencsv/2.3//opencsv-2.3.jar
179-
orc-core/1.5.8//orc-core-1.5.8.jar
180-
orc-mapreduce/1.5.8//orc-mapreduce-1.5.8.jar
181-
orc-shims/1.5.8//orc-shims-1.5.8.jar
179+
orc-core/1.5.9//orc-core-1.5.9.jar
180+
orc-mapreduce/1.5.9//orc-mapreduce-1.5.9.jar
181+
orc-shims/1.5.9//orc-shims-1.5.9.jar
182182
oro/2.0.8//oro-2.0.8.jar
183183
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
184184
paranamer/2.8//paranamer-2.8.jar
@@ -211,6 +211,7 @@ stax-api/1.0-2//stax-api-1.0-2.jar
211211
stax-api/1.0.1//stax-api-1.0.1.jar
212212
stream/2.9.6//stream-2.9.6.jar
213213
super-csv/2.2.0//super-csv-2.2.0.jar
214+
threeten-extra/1.5.0//threeten-extra-1.5.0.jar
214215
transaction-api/1.1//transaction-api-1.1.jar
215216
univocity-parsers/2.8.3//univocity-parsers-2.8.3.jar
216217
velocity/1.5//velocity-1.5.jar

dev/deps/spark-deps-hadoop-3.2-hive-2.3

+5-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ hive-shims-0.23/2.3.6//hive-shims-0.23-2.3.6.jar
9191
hive-shims-common/2.3.6//hive-shims-common-2.3.6.jar
9292
hive-shims-scheduler/2.3.6//hive-shims-scheduler-2.3.6.jar
9393
hive-shims/2.3.6//hive-shims-2.3.6.jar
94-
hive-storage-api/2.6.0//hive-storage-api-2.6.0.jar
94+
hive-storage-api/2.7.1//hive-storage-api-2.7.1.jar
9595
hive-vector-code-gen/2.3.6//hive-vector-code-gen-2.3.6.jar
9696
hk2-api/2.6.1//hk2-api-2.6.1.jar
9797
hk2-locator/2.6.1//hk2-locator-2.6.1.jar
@@ -191,9 +191,9 @@ okhttp/2.7.5//okhttp-2.7.5.jar
191191
okhttp/3.12.6//okhttp-3.12.6.jar
192192
okio/1.15.0//okio-1.15.0.jar
193193
opencsv/2.3//opencsv-2.3.jar
194-
orc-core/1.5.8//orc-core-1.5.8.jar
195-
orc-mapreduce/1.5.8//orc-mapreduce-1.5.8.jar
196-
orc-shims/1.5.8//orc-shims-1.5.8.jar
194+
orc-core/1.5.9//orc-core-1.5.9.jar
195+
orc-mapreduce/1.5.9//orc-mapreduce-1.5.9.jar
196+
orc-shims/1.5.9//orc-shims-1.5.9.jar
197197
oro/2.0.8//oro-2.0.8.jar
198198
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
199199
paranamer/2.8//paranamer-2.8.jar
@@ -227,6 +227,7 @@ stax-api/1.0.1//stax-api-1.0.1.jar
227227
stax2-api/3.1.4//stax2-api-3.1.4.jar
228228
stream/2.9.6//stream-2.9.6.jar
229229
super-csv/2.2.0//super-csv-2.2.0.jar
230+
threeten-extra/1.5.0//threeten-extra-1.5.0.jar
230231
token-provider/1.0.1//token-provider-1.0.1.jar
231232
transaction-api/1.1//transaction-api-1.1.jar
232233
univocity-parsers/2.8.3//univocity-parsers-2.8.3.jar

pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<kafka.version>2.4.0</kafka.version>
136136
<derby.version>10.12.1.1</derby.version>
137137
<parquet.version>1.10.1</parquet.version>
138-
<orc.version>1.5.8</orc.version>
138+
<orc.version>1.5.9</orc.version>
139139
<orc.classifier></orc.classifier>
140140
<hive.parquet.group>com.twitter</hive.parquet.group>
141141
<hive.parquet.version>1.6.0</hive.parquet.version>
@@ -227,6 +227,7 @@
227227
<hadoop.deps.scope>compile</hadoop.deps.scope>
228228
<hive.deps.scope>compile</hive.deps.scope>
229229
<hive.parquet.scope>provided</hive.parquet.scope>
230+
<hive.storage.version>2.7.1</hive.storage.version>
230231
<hive.storage.scope>compile</hive.storage.scope>
231232
<hive.common.scope>compile</hive.common.scope>
232233
<hive.llap.scope>compile</hive.llap.scope>
@@ -2244,7 +2245,7 @@
22442245
<dependency>
22452246
<groupId>org.apache.hive</groupId>
22462247
<artifactId>hive-storage-api</artifactId>
2247-
<version>2.6.0</version>
2248+
<version>${hive.storage.version}</version>
22482249
<scope>${hive.storage.scope}</scope>
22492250
<exclusions>
22502251
<exclusion>
@@ -3006,6 +3007,7 @@
30063007
<!-- Version used for internal directory structure -->
30073008
<hive.version.short>1.2</hive.version.short>
30083009
<hive.parquet.scope>${hive.deps.scope}</hive.parquet.scope>
3010+
<hive.storage.version>2.6.0</hive.storage.version>
30093011
<hive.storage.scope>provided</hive.storage.scope>
30103012
<hive.common.scope>provided</hive.common.scope>
30113013
<hive.llap.scope>provided</hive.llap.scope>

0 commit comments

Comments
 (0)