Skip to content

Commit a1706e2

Browse files
committed
[SPARK-30005][INFRA] Update test-dependencies.sh to check hive-1.2/2.3 profile
### What changes were proposed in this pull request? This PR aims to update `test-dependencies.sh` to validate all available `Hadoop/Hive` combination. ### Why are the changes needed? Previously, we have been checking only `Hadoop2.7/Hive1.2` and `Hadoop3.2/Hive2.3`. We need to validate `Hadoop2.7/Hive2.3` additionally for Apache Spark 3.0. ### Does this PR introduce any user-facing change? No. (This is a dev-only change). ### How was this patch tested? Pass the GitHub Action (Linter) with the newly updated manifest because this is only dependency check. Closes #26646 from dongjoon-hyun/SPARK-30005. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 3f3a18f commit a1706e2

File tree

4 files changed

+242
-12
lines changed

4 files changed

+242
-12
lines changed
Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
HikariCP-2.5.1.jar
2+
JLargeArrays-1.5.jar
3+
JTransforms-3.1.jar
4+
RoaringBitmap-0.7.45.jar
5+
ST4-4.0.4.jar
6+
activation-1.1.1.jar
7+
aircompressor-0.10.jar
8+
algebra_2.12-2.0.0-M2.jar
9+
antlr-runtime-3.5.2.jar
10+
antlr4-runtime-4.7.1.jar
11+
aopalliance-1.0.jar
12+
aopalliance-repackaged-2.5.0.jar
13+
apacheds-i18n-2.0.0-M15.jar
14+
apacheds-kerberos-codec-2.0.0-M15.jar
15+
api-asn1-api-1.0.0-M20.jar
16+
api-util-1.0.0-M20.jar
17+
arpack_combined_all-0.1.jar
18+
arrow-format-0.15.1.jar
19+
arrow-memory-0.15.1.jar
20+
arrow-vector-0.15.1.jar
21+
audience-annotations-0.5.0.jar
22+
automaton-1.11-8.jar
23+
avro-1.8.2.jar
24+
avro-ipc-1.8.2.jar
25+
avro-mapred-1.8.2-hadoop2.jar
26+
bonecp-0.8.0.RELEASE.jar
27+
breeze-macros_2.12-1.0.jar
28+
breeze_2.12-1.0.jar
29+
cats-kernel_2.12-2.0.0-M4.jar
30+
chill-java-0.9.3.jar
31+
chill_2.12-0.9.3.jar
32+
commons-beanutils-1.9.4.jar
33+
commons-cli-1.2.jar
34+
commons-codec-1.10.jar
35+
commons-collections-3.2.2.jar
36+
commons-compiler-3.0.15.jar
37+
commons-compress-1.8.1.jar
38+
commons-configuration-1.6.jar
39+
commons-crypto-1.0.0.jar
40+
commons-dbcp-1.4.jar
41+
commons-digester-1.8.jar
42+
commons-httpclient-3.1.jar
43+
commons-io-2.4.jar
44+
commons-lang-2.6.jar
45+
commons-lang3-3.8.1.jar
46+
commons-logging-1.1.3.jar
47+
commons-math3-3.4.1.jar
48+
commons-net-3.1.jar
49+
commons-pool-1.5.4.jar
50+
commons-text-1.6.jar
51+
compress-lzf-1.0.3.jar
52+
core-1.1.2.jar
53+
curator-client-2.7.1.jar
54+
curator-framework-2.7.1.jar
55+
curator-recipes-2.7.1.jar
56+
datanucleus-api-jdo-4.2.4.jar
57+
datanucleus-core-4.1.17.jar
58+
datanucleus-rdbms-4.1.19.jar
59+
derby-10.12.1.1.jar
60+
dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
61+
flatbuffers-java-1.9.0.jar
62+
generex-1.0.2.jar
63+
gson-2.2.4.jar
64+
guava-14.0.1.jar
65+
guice-3.0.jar
66+
guice-servlet-3.0.jar
67+
hadoop-annotations-2.7.4.jar
68+
hadoop-auth-2.7.4.jar
69+
hadoop-client-2.7.4.jar
70+
hadoop-common-2.7.4.jar
71+
hadoop-hdfs-2.7.4.jar
72+
hadoop-mapreduce-client-app-2.7.4.jar
73+
hadoop-mapreduce-client-common-2.7.4.jar
74+
hadoop-mapreduce-client-core-2.7.4.jar
75+
hadoop-mapreduce-client-jobclient-2.7.4.jar
76+
hadoop-mapreduce-client-shuffle-2.7.4.jar
77+
hadoop-yarn-api-2.7.4.jar
78+
hadoop-yarn-client-2.7.4.jar
79+
hadoop-yarn-common-2.7.4.jar
80+
hadoop-yarn-server-common-2.7.4.jar
81+
hadoop-yarn-server-web-proxy-2.7.4.jar
82+
hive-beeline-2.3.6.jar
83+
hive-cli-2.3.6.jar
84+
hive-common-2.3.6.jar
85+
hive-exec-2.3.6-core.jar
86+
hive-jdbc-2.3.6.jar
87+
hive-llap-common-2.3.6.jar
88+
hive-metastore-2.3.6.jar
89+
hive-serde-2.3.6.jar
90+
hive-service-rpc-2.3.6.jar
91+
hive-shims-0.23-2.3.6.jar
92+
hive-shims-2.3.6.jar
93+
hive-shims-common-2.3.6.jar
94+
hive-shims-scheduler-2.3.6.jar
95+
hive-storage-api-2.6.0.jar
96+
hive-vector-code-gen-2.3.6.jar
97+
hk2-api-2.5.0.jar
98+
hk2-locator-2.5.0.jar
99+
hk2-utils-2.5.0.jar
100+
htrace-core-3.1.0-incubating.jar
101+
httpclient-4.5.6.jar
102+
httpcore-4.4.10.jar
103+
istack-commons-runtime-3.0.8.jar
104+
ivy-2.4.0.jar
105+
jackson-annotations-2.10.0.jar
106+
jackson-core-2.10.0.jar
107+
jackson-core-asl-1.9.13.jar
108+
jackson-databind-2.10.0.jar
109+
jackson-dataformat-yaml-2.10.0.jar
110+
jackson-jaxrs-1.9.13.jar
111+
jackson-mapper-asl-1.9.13.jar
112+
jackson-module-jaxb-annotations-2.10.0.jar
113+
jackson-module-paranamer-2.10.0.jar
114+
jackson-module-scala_2.12-2.10.0.jar
115+
jackson-xc-1.9.13.jar
116+
jakarta.activation-api-1.2.1.jar
117+
jakarta.annotation-api-1.3.4.jar
118+
jakarta.inject-2.5.0.jar
119+
jakarta.ws.rs-api-2.1.5.jar
120+
jakarta.xml.bind-api-2.3.2.jar
121+
janino-3.0.15.jar
122+
javassist-3.22.0-CR2.jar
123+
javax.inject-1.jar
124+
javax.jdo-3.2.0-m3.jar
125+
javax.servlet-api-3.1.0.jar
126+
javolution-5.5.1.jar
127+
jaxb-api-2.2.2.jar
128+
jaxb-runtime-2.3.2.jar
129+
jcl-over-slf4j-1.7.16.jar
130+
jdo-api-3.0.1.jar
131+
jersey-client-2.29.jar
132+
jersey-common-2.29.jar
133+
jersey-container-servlet-2.29.jar
134+
jersey-container-servlet-core-2.29.jar
135+
jersey-hk2-2.29.jar
136+
jersey-media-jaxb-2.29.jar
137+
jersey-server-2.29.jar
138+
jetty-6.1.26.jar
139+
jetty-sslengine-6.1.26.jar
140+
jetty-util-6.1.26.jar
141+
jline-2.14.6.jar
142+
joda-time-2.10.5.jar
143+
jodd-core-3.5.2.jar
144+
jpam-1.1.jar
145+
json-1.8.jar
146+
json4s-ast_2.12-3.6.6.jar
147+
json4s-core_2.12-3.6.6.jar
148+
json4s-jackson_2.12-3.6.6.jar
149+
json4s-scalap_2.12-3.6.6.jar
150+
jsp-api-2.1.jar
151+
jsr305-3.0.0.jar
152+
jta-1.1.jar
153+
jul-to-slf4j-1.7.16.jar
154+
kryo-shaded-4.0.2.jar
155+
kubernetes-client-4.6.1.jar
156+
kubernetes-model-4.6.1.jar
157+
kubernetes-model-common-4.6.1.jar
158+
leveldbjni-all-1.8.jar
159+
libfb303-0.9.3.jar
160+
libthrift-0.12.0.jar
161+
log4j-1.2.17.jar
162+
logging-interceptor-3.12.0.jar
163+
lz4-java-1.6.0.jar
164+
machinist_2.12-0.6.8.jar
165+
macro-compat_2.12-1.1.1.jar
166+
mesos-1.4.0-shaded-protobuf.jar
167+
metrics-core-4.1.1.jar
168+
metrics-graphite-4.1.1.jar
169+
metrics-jmx-4.1.1.jar
170+
metrics-json-4.1.1.jar
171+
metrics-jvm-4.1.1.jar
172+
minlog-1.3.0.jar
173+
netty-all-4.1.42.Final.jar
174+
objenesis-2.5.1.jar
175+
okapi-shade-0.4.2.jar
176+
okhttp-3.12.0.jar
177+
okio-1.15.0.jar
178+
opencsv-2.3.jar
179+
orc-core-1.5.7.jar
180+
orc-mapreduce-1.5.7.jar
181+
orc-shims-1.5.7.jar
182+
oro-2.0.8.jar
183+
osgi-resource-locator-1.0.3.jar
184+
paranamer-2.8.jar
185+
parquet-column-1.10.1.jar
186+
parquet-common-1.10.1.jar
187+
parquet-encoding-1.10.1.jar
188+
parquet-format-2.4.0.jar
189+
parquet-hadoop-1.10.1.jar
190+
parquet-jackson-1.10.1.jar
191+
protobuf-java-2.5.0.jar
192+
py4j-0.10.8.1.jar
193+
pyrolite-4.30.jar
194+
scala-collection-compat_2.12-2.1.1.jar
195+
scala-compiler-2.12.10.jar
196+
scala-library-2.12.10.jar
197+
scala-parser-combinators_2.12-1.1.2.jar
198+
scala-reflect-2.12.10.jar
199+
scala-xml_2.12-1.2.0.jar
200+
shapeless_2.12-2.3.3.jar
201+
shims-0.7.45.jar
202+
slf4j-api-1.7.16.jar
203+
slf4j-log4j12-1.7.16.jar
204+
snakeyaml-1.24.jar
205+
snappy-java-1.1.7.3.jar
206+
spire-macros_2.12-0.17.0-M1.jar
207+
spire-platform_2.12-0.17.0-M1.jar
208+
spire-util_2.12-0.17.0-M1.jar
209+
spire_2.12-0.17.0-M1.jar
210+
stax-api-1.0-2.jar
211+
stax-api-1.0.1.jar
212+
stream-2.9.6.jar
213+
super-csv-2.2.0.jar
214+
transaction-api-1.1.jar
215+
univocity-parsers-2.8.3.jar
216+
validation-api-2.0.1.Final.jar
217+
velocity-1.5.jar
218+
xbean-asm7-shaded-4.15.jar
219+
xercesImpl-2.9.1.jar
220+
xmlenc-0.52.jar
221+
xz-1.5.jar
222+
zjsonpatch-0.3.0.jar
223+
zookeeper-3.4.14.jar
224+
zstd-jni-1.4.3-1.jar

dev/test-dependencies.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ export LC_ALL=C
3131
# NOTE: These should match those in the release publishing script
3232
HADOOP2_MODULE_PROFILES="-Phive-thriftserver -Pmesos -Pkubernetes -Pyarn -Phive"
3333
MVN="build/mvn"
34-
HADOOP_PROFILES=(
35-
hadoop-2.7
36-
hadoop-3.2
34+
HADOOP_HIVE_PROFILES=(
35+
hadoop-2.7-hive-1.2
36+
hadoop-2.7-hive-2.3
37+
hadoop-3.2-hive-2.3
3738
)
3839

3940
# We'll switch the version to a temp. one, publish POMs using that new version, then switch back to
@@ -66,24 +67,29 @@ trap reset_version EXIT
6667
$MVN -q versions:set -DnewVersion=$TEMP_VERSION -DgenerateBackupPoms=false > /dev/null
6768

6869
# Generate manifests for each Hadoop profile:
69-
for HADOOP_PROFILE in "${HADOOP_PROFILES[@]}"; do
70-
if [[ $HADOOP_PROFILE == **hadoop-3** ]]; then
70+
for HADOOP_HIVE_PROFILE in "${HADOOP_HIVE_PROFILES[@]}"; do
71+
if [[ $HADOOP_HIVE_PROFILE == **hadoop-3.2-hive-2.3** ]]; then
72+
HADOOP_PROFILE=hadoop-3.2
73+
HIVE_PROFILE=hive-2.3
74+
elif [[ $HADOOP_HIVE_PROFILE == **hadoop-2.7-hive-2.3** ]]; then
75+
HADOOP_PROFILE=hadoop-2.7
7176
HIVE_PROFILE=hive-2.3
7277
else
78+
HADOOP_PROFILE=hadoop-2.7
7379
HIVE_PROFILE=hive-1.2
7480
fi
75-
echo "Performing Maven install for $HADOOP_PROFILE"
81+
echo "Performing Maven install for $HADOOP_HIVE_PROFILE"
7682
$MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE -P$HIVE_PROFILE jar:jar jar:test-jar install:install clean -q
7783

78-
echo "Performing Maven validate for $HADOOP_PROFILE"
84+
echo "Performing Maven validate for $HADOOP_HIVE_PROFILE"
7985
$MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE -P$HIVE_PROFILE validate -q
8086

81-
echo "Generating dependency manifest for $HADOOP_PROFILE"
87+
echo "Generating dependency manifest for $HADOOP_HIVE_PROFILE"
8288
mkdir -p dev/pr-deps
8389
$MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE -P$HIVE_PROFILE dependency:build-classpath -pl assembly -am \
8490
| grep "Dependencies classpath:" -A 1 \
8591
| tail -n 1 | tr ":" "\n" | rev | cut -d "/" -f 1 | rev | sort \
86-
| grep -v spark > dev/pr-deps/spark-deps-$HADOOP_PROFILE
92+
| grep -v spark > dev/pr-deps/spark-deps-$HADOOP_HIVE_PROFILE
8793
done
8894

8995
if [[ $@ == **replace-manifest** ]]; then
@@ -93,13 +99,13 @@ if [[ $@ == **replace-manifest** ]]; then
9399
exit 0
94100
fi
95101

96-
for HADOOP_PROFILE in "${HADOOP_PROFILES[@]}"; do
102+
for HADOOP_HIVE_PROFILE in "${HADOOP_HIVE_PROFILES[@]}"; do
97103
set +e
98104
dep_diff="$(
99105
git diff \
100106
--no-index \
101-
dev/deps/spark-deps-$HADOOP_PROFILE \
102-
dev/pr-deps/spark-deps-$HADOOP_PROFILE \
107+
dev/deps/spark-deps-$HADOOP_HIVE_PROFILE \
108+
dev/pr-deps/spark-deps-$HADOOP_HIVE_PROFILE \
103109
)"
104110
set -e
105111
if [ "$dep_diff" != "" ]; then

0 commit comments

Comments
 (0)