-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-36676][SQL][BUILD] Create shaded Hive module and upgrade Guava version to 30.1.1-jre #33989
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
aab8b3d
8232114
1fe61ec
4b1b7c9
0e3c47e
efecbea
30a3ee1
835efed
005862c
b91f8eb
02bf93f
5f63bab
170a8c4
3294e98
4001fec
32e4a75
ffd9f2d
4289065
b0aba1f
883f99f
0fbd296
f317b67
2862cc9
a490c79
05e641b
6b57ccc
c2ec1f8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,10 @@ | ||
| HikariCP/2.5.1//HikariCP-2.5.1.jar | ||
| JLargeArrays/1.5//JLargeArrays-1.5.jar | ||
| JTransforms/3.1//JTransforms-3.1.jar | ||
| RoaringBitmap/0.9.0//RoaringBitmap-0.9.0.jar | ||
| ST4/4.0.4//ST4-4.0.4.jar | ||
| activation/1.1.1//activation-1.1.1.jar | ||
| aircompressor/0.21//aircompressor-0.21.jar | ||
| algebra_2.12/2.0.1//algebra_2.12-2.0.1.jar | ||
| annotations/17.0.0//annotations-17.0.0.jar | ||
| antlr-runtime/3.5.2//antlr-runtime-3.5.2.jar | ||
| antlr4-runtime/4.8//antlr4-runtime-4.8.jar | ||
| aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar | ||
| aopalliance/1.0//aopalliance-1.0.jar | ||
|
|
@@ -27,10 +24,10 @@ avro-ipc/1.10.2//avro-ipc-1.10.2.jar | |
| avro-mapred/1.10.2//avro-mapred-1.10.2.jar | ||
| avro/1.10.2//avro-1.10.2.jar | ||
| blas/2.2.0//blas-2.2.0.jar | ||
| bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar | ||
| breeze-macros_2.12/1.2//breeze-macros_2.12-1.2.jar | ||
| breeze_2.12/1.2//breeze_2.12-1.2.jar | ||
| cats-kernel_2.12/2.1.1//cats-kernel_2.12-2.1.1.jar | ||
| checker-qual/3.8.0//checker-qual-3.8.0.jar | ||
sunchao marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| chill-java/0.10.0//chill-java-0.10.0.jar | ||
| chill_2.12/0.10.0//chill_2.12-0.10.0.jar | ||
| commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar | ||
|
|
@@ -41,7 +38,6 @@ commons-compiler/3.0.16//commons-compiler-3.0.16.jar | |
| commons-compress/1.21//commons-compress-1.21.jar | ||
| commons-configuration/1.6//commons-configuration-1.6.jar | ||
| commons-crypto/1.1.0//commons-crypto-1.1.0.jar | ||
| commons-dbcp/1.4//commons-dbcp-1.4.jar | ||
| commons-digester/1.8//commons-digester-1.8.jar | ||
| commons-httpclient/3.1//commons-httpclient-3.1.jar | ||
| commons-io/2.4//commons-io-2.4.jar | ||
|
|
@@ -50,7 +46,6 @@ commons-lang3/3.12.0//commons-lang3-3.12.0.jar | |
| commons-logging/1.1.3//commons-logging-1.1.3.jar | ||
| commons-math3/3.4.1//commons-math3-3.4.1.jar | ||
| commons-net/3.1//commons-net-3.1.jar | ||
| commons-pool/1.5.4//commons-pool-1.5.4.jar | ||
| commons-text/1.6//commons-text-1.6.jar | ||
| compress-lzf/1.0.3//compress-lzf-1.0.3.jar | ||
| core/1.1.2//core-1.1.2.jar | ||
|
|
@@ -61,11 +56,12 @@ datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar | |
| datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar | ||
| datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar | ||
| derby/10.14.2.0//derby-10.14.2.0.jar | ||
| dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar | ||
| error_prone_annotations/2.5.1//error_prone_annotations-2.5.1.jar | ||
| failureaccess/1.0.1//failureaccess-1.0.1.jar | ||
sunchao marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar | ||
| generex/1.0.2//generex-1.0.2.jar | ||
| gson/2.2.4//gson-2.2.4.jar | ||
| guava/14.0.1//guava-14.0.1.jar | ||
| guava/30.1.1-jre//guava-30.1.1-jre.jar | ||
|
||
| guice-servlet/3.0//guice-servlet-3.0.jar | ||
| guice/3.0//guice-3.0.jar | ||
| hadoop-annotations/2.7.4//hadoop-annotations-2.7.4.jar | ||
|
|
@@ -83,21 +79,7 @@ hadoop-yarn-client/2.7.4//hadoop-yarn-client-2.7.4.jar | |
| hadoop-yarn-common/2.7.4//hadoop-yarn-common-2.7.4.jar | ||
| hadoop-yarn-server-common/2.7.4//hadoop-yarn-server-common-2.7.4.jar | ||
| hadoop-yarn-server-web-proxy/2.7.4//hadoop-yarn-server-web-proxy-2.7.4.jar | ||
| hive-beeline/2.3.9//hive-beeline-2.3.9.jar | ||
| hive-cli/2.3.9//hive-cli-2.3.9.jar | ||
| hive-common/2.3.9//hive-common-2.3.9.jar | ||
| hive-exec/2.3.9/core/hive-exec-2.3.9-core.jar | ||
| hive-jdbc/2.3.9//hive-jdbc-2.3.9.jar | ||
| hive-llap-common/2.3.9//hive-llap-common-2.3.9.jar | ||
| hive-metastore/2.3.9//hive-metastore-2.3.9.jar | ||
| hive-serde/2.3.9//hive-serde-2.3.9.jar | ||
| hive-service-rpc/3.1.2//hive-service-rpc-3.1.2.jar | ||
| hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.9.jar | ||
| hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar | ||
| hive-shims-scheduler/2.3.9//hive-shims-scheduler-2.3.9.jar | ||
| hive-shims/2.3.9//hive-shims-2.3.9.jar | ||
| hive-storage-api/2.7.2//hive-storage-api-2.7.2.jar | ||
| hive-vector-code-gen/2.3.9//hive-vector-code-gen-2.3.9.jar | ||
| hk2-api/2.6.1//hk2-api-2.6.1.jar | ||
| hk2-locator/2.6.1//hk2-locator-2.6.1.jar | ||
| hk2-utils/2.6.1//hk2-utils-2.6.1.jar | ||
|
|
@@ -106,6 +88,7 @@ httpclient/4.5.13//httpclient-4.5.13.jar | |
| httpcore/4.4.14//httpcore-4.4.14.jar | ||
| istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar | ||
| ivy/2.5.0//ivy-2.5.0.jar | ||
| j2objc-annotations/1.3//j2objc-annotations-1.3.jar | ||
| jackson-annotations/2.12.5//jackson-annotations-2.12.5.jar | ||
| jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar | ||
| jackson-core/2.12.5//jackson-core-2.12.5.jar | ||
|
|
@@ -126,7 +109,6 @@ janino/3.0.16//janino-3.0.16.jar | |
| javassist/3.25.0-GA//javassist-3.25.0-GA.jar | ||
| javax.inject/1//javax.inject-1.jar | ||
| javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar | ||
| javolution/5.5.1//javolution-5.5.1.jar | ||
| jaxb-api/2.2.11//jaxb-api-2.2.11.jar | ||
| jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar | ||
| jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar | ||
|
|
@@ -144,7 +126,6 @@ jline/2.14.6//jline-2.14.6.jar | |
| joda-time/2.10.10//joda-time-2.10.10.jar | ||
| jodd-core/3.5.2//jodd-core-3.5.2.jar | ||
| jpam/1.1//jpam-1.1.jar | ||
| json/1.8//json-1.8.jar | ||
| json4s-ast_2.12/3.7.0-M11//json4s-ast_2.12-3.7.0-M11.jar | ||
| json4s-core_2.12/3.7.0-M11//json4s-core_2.12-3.7.0-M11.jar | ||
| json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar | ||
|
|
@@ -179,6 +160,7 @@ lapack/2.2.0//lapack-2.2.0.jar | |
| leveldbjni-all/1.8//leveldbjni-all-1.8.jar | ||
| libfb303/0.9.3//libfb303-0.9.3.jar | ||
| libthrift/0.12.0//libthrift-0.12.0.jar | ||
| listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar | ||
| log4j/1.2.17//log4j-1.2.17.jar | ||
| logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar | ||
| lz4-java/1.8.0//lz4-java-1.8.0.jar | ||
|
|
@@ -229,12 +211,10 @@ spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar | |
| spire_2.12/0.17.0//spire_2.12-0.17.0.jar | ||
| stax-api/1.0.1//stax-api-1.0.1.jar | ||
| stream/2.9.6//stream-2.9.6.jar | ||
| super-csv/2.2.0//super-csv-2.2.0.jar | ||
| threeten-extra/1.5.0//threeten-extra-1.5.0.jar | ||
| tink/1.6.0//tink-1.6.0.jar | ||
| transaction-api/1.1//transaction-api-1.1.jar | ||
| univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar | ||
| velocity/1.5//velocity-1.5.jar | ||
| xbean-asm9-shaded/4.20//xbean-asm9-shaded-4.20.jar | ||
| xercesImpl/2.12.0//xercesImpl-2.12.0.jar | ||
| xml-apis/1.4.01//xml-apis-1.4.01.jar | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,10 @@ | ||
| HikariCP/2.5.1//HikariCP-2.5.1.jar | ||
| JLargeArrays/1.5//JLargeArrays-1.5.jar | ||
| JTransforms/3.1//JTransforms-3.1.jar | ||
| RoaringBitmap/0.9.0//RoaringBitmap-0.9.0.jar | ||
| ST4/4.0.4//ST4-4.0.4.jar | ||
| activation/1.1.1//activation-1.1.1.jar | ||
| aircompressor/0.21//aircompressor-0.21.jar | ||
| algebra_2.12/2.0.1//algebra_2.12-2.0.1.jar | ||
| annotations/17.0.0//annotations-17.0.0.jar | ||
| antlr-runtime/3.5.2//antlr-runtime-3.5.2.jar | ||
| antlr4-runtime/4.8//antlr4-runtime-4.8.jar | ||
| aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar | ||
| arpack/2.2.0//arpack-2.2.0.jar | ||
|
|
@@ -22,10 +19,10 @@ avro-ipc/1.10.2//avro-ipc-1.10.2.jar | |
| avro-mapred/1.10.2//avro-mapred-1.10.2.jar | ||
| avro/1.10.2//avro-1.10.2.jar | ||
| blas/2.2.0//blas-2.2.0.jar | ||
| bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar | ||
| breeze-macros_2.12/1.2//breeze-macros_2.12-1.2.jar | ||
| breeze_2.12/1.2//breeze_2.12-1.2.jar | ||
| cats-kernel_2.12/2.1.1//cats-kernel_2.12-2.1.1.jar | ||
| checker-qual/3.8.0//checker-qual-3.8.0.jar | ||
| chill-java/0.10.0//chill-java-0.10.0.jar | ||
| chill_2.12/0.10.0//chill_2.12-0.10.0.jar | ||
| commons-cli/1.2//commons-cli-1.2.jar | ||
|
|
@@ -34,14 +31,12 @@ commons-collections/3.2.2//commons-collections-3.2.2.jar | |
| commons-compiler/3.0.16//commons-compiler-3.0.16.jar | ||
| commons-compress/1.21//commons-compress-1.21.jar | ||
| commons-crypto/1.1.0//commons-crypto-1.1.0.jar | ||
| commons-dbcp/1.4//commons-dbcp-1.4.jar | ||
| commons-io/2.11.0//commons-io-2.11.0.jar | ||
| commons-lang/2.6//commons-lang-2.6.jar | ||
| commons-lang3/3.12.0//commons-lang3-3.12.0.jar | ||
| commons-logging/1.1.3//commons-logging-1.1.3.jar | ||
| commons-math3/3.4.1//commons-math3-3.4.1.jar | ||
| commons-net/3.1//commons-net-3.1.jar | ||
| commons-pool/1.5.4//commons-pool-1.5.4.jar | ||
| commons-text/1.6//commons-text-1.6.jar | ||
| compress-lzf/1.0.3//compress-lzf-1.0.3.jar | ||
| core/1.1.2//core-1.1.2.jar | ||
|
|
@@ -52,30 +47,17 @@ datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar | |
| datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar | ||
| datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar | ||
| derby/10.14.2.0//derby-10.14.2.0.jar | ||
| dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar | ||
| error_prone_annotations/2.5.1//error_prone_annotations-2.5.1.jar | ||
| failureaccess/1.0.1//failureaccess-1.0.1.jar | ||
| flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar | ||
| generex/1.0.2//generex-1.0.2.jar | ||
| gson/2.2.4//gson-2.2.4.jar | ||
| guava/14.0.1//guava-14.0.1.jar | ||
| gson/2.8.6//gson-2.8.6.jar | ||
|
||
| guava/30.1.1-jre//guava-30.1.1-jre.jar | ||
| hadoop-client-api/3.3.1//hadoop-client-api-3.3.1.jar | ||
| hadoop-client-runtime/3.3.1//hadoop-client-runtime-3.3.1.jar | ||
| hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar | ||
| hadoop-yarn-server-web-proxy/3.3.1//hadoop-yarn-server-web-proxy-3.3.1.jar | ||
| hive-beeline/2.3.9//hive-beeline-2.3.9.jar | ||
| hive-cli/2.3.9//hive-cli-2.3.9.jar | ||
| hive-common/2.3.9//hive-common-2.3.9.jar | ||
| hive-exec/2.3.9/core/hive-exec-2.3.9-core.jar | ||
| hive-jdbc/2.3.9//hive-jdbc-2.3.9.jar | ||
| hive-llap-common/2.3.9//hive-llap-common-2.3.9.jar | ||
| hive-metastore/2.3.9//hive-metastore-2.3.9.jar | ||
| hive-serde/2.3.9//hive-serde-2.3.9.jar | ||
| hive-service-rpc/3.1.2//hive-service-rpc-3.1.2.jar | ||
| hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.9.jar | ||
| hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar | ||
| hive-shims-scheduler/2.3.9//hive-shims-scheduler-2.3.9.jar | ||
| hive-shims/2.3.9//hive-shims-2.3.9.jar | ||
| hive-storage-api/2.7.2//hive-storage-api-2.7.2.jar | ||
| hive-vector-code-gen/2.3.9//hive-vector-code-gen-2.3.9.jar | ||
| hk2-api/2.6.1//hk2-api-2.6.1.jar | ||
| hk2-locator/2.6.1//hk2-locator-2.6.1.jar | ||
| hk2-utils/2.6.1//hk2-utils-2.6.1.jar | ||
|
|
@@ -84,6 +66,7 @@ httpclient/4.5.13//httpclient-4.5.13.jar | |
| httpcore/4.4.14//httpcore-4.4.14.jar | ||
| istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar | ||
| ivy/2.5.0//ivy-2.5.0.jar | ||
| j2objc-annotations/1.3//j2objc-annotations-1.3.jar | ||
| jackson-annotations/2.12.5//jackson-annotations-2.12.5.jar | ||
| jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar | ||
| jackson-core/2.12.5//jackson-core-2.12.5.jar | ||
|
|
@@ -101,7 +84,6 @@ jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar | |
| janino/3.0.16//janino-3.0.16.jar | ||
| javassist/3.25.0-GA//javassist-3.25.0-GA.jar | ||
| javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar | ||
| javolution/5.5.1//javolution-5.5.1.jar | ||
| jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar | ||
| jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar | ||
| jdo-api/3.0.1//jdo-api-3.0.1.jar | ||
|
|
@@ -115,7 +97,6 @@ jline/2.14.6//jline-2.14.6.jar | |
| joda-time/2.10.10//joda-time-2.10.10.jar | ||
| jodd-core/3.5.2//jodd-core-3.5.2.jar | ||
| jpam/1.1//jpam-1.1.jar | ||
| json/1.8//json-1.8.jar | ||
| json4s-ast_2.12/3.7.0-M11//json4s-ast_2.12-3.7.0-M11.jar | ||
| json4s-core_2.12/3.7.0-M11//json4s-core_2.12-3.7.0-M11.jar | ||
| json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar | ||
|
|
@@ -149,6 +130,7 @@ lapack/2.2.0//lapack-2.2.0.jar | |
| leveldbjni-all/1.8//leveldbjni-all-1.8.jar | ||
| libfb303/0.9.3//libfb303-0.9.3.jar | ||
| libthrift/0.12.0//libthrift-0.12.0.jar | ||
| listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar | ||
| log4j/1.2.17//log4j-1.2.17.jar | ||
| logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar | ||
| lz4-java/1.8.0//lz4-java-1.8.0.jar | ||
|
|
@@ -199,12 +181,10 @@ spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar | |
| spire_2.12/0.17.0//spire_2.12-0.17.0.jar | ||
| stax-api/1.0.1//stax-api-1.0.1.jar | ||
| stream/2.9.6//stream-2.9.6.jar | ||
| super-csv/2.2.0//super-csv-2.2.0.jar | ||
| threeten-extra/1.5.0//threeten-extra-1.5.0.jar | ||
| tink/1.6.0//tink-1.6.0.jar | ||
| transaction-api/1.1//transaction-api-1.1.jar | ||
| univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar | ||
| velocity/1.5//velocity-1.5.jar | ||
| xbean-asm9-shaded/4.20//xbean-asm9-shaded-4.20.jar | ||
| xz/1.8//xz-1.8.jar | ||
| zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@viirya with this,
-Phive-providedis now taking effect onhive-shadedjar. If this is turned on, the Spark binary distribution will not contain the jar and users should provide the individual Hive jars instead. They are also on their own for any Guava conflicts.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay thanks for the update!