Skip to content

Commit c9f2f3e

Browse files
committed
Cleans lib_managed before compiling with Hive 0.13.1
1 parent a764960 commit c9f2f3e

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

dev/run-tests

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,20 +141,22 @@ CURRENT_BLOCK=$BLOCK_BUILD
141141
{
142142

143143
# NOTE: echo "q" is needed because sbt on encountering a build file with failure
144-
#+ (either resolution or compilation) prompts the user for input either q, r, etc
145-
#+ to quit or retry. This echo is there to make it not block.
144+
# (either resolution or compilation) prompts the user for input either q, r, etc
145+
# to quit or retry. This echo is there to make it not block.
146146
# NOTE: Do not quote $BUILD_MVN_PROFILE_ARGS or else it will be interpreted as a
147-
#+ single argument!
147+
# single argument!
148148
# QUESTION: Why doesn't 'yes "q"' work?
149149
# QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
150-
# First build with 0.12 to ensure patches do not break the hive 12 build
150+
# First build with Hive 0.12.0 to ensure patches do not break the Hive 0.12.0 build
151151
HIVE_12_BUILD_ARGS="$SBT_MAVEN_PROFILES_ARGS -Phive -Phive-thriftserver -Phive-0.12.0"
152-
echo "[info] Compile with hive 0.12"
152+
echo "[info] Compile with Hive 0.12.0"
153153
echo -e "q\n" \
154154
| sbt/sbt $HIVE_12_BUILD_ARGS clean hive/compile hive-thriftserver/compile \
155155
| grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"
156156

157-
# Then build with default version(0.13.1) because tests are based on this version
157+
# Then build with default Hive version (0.13.1) because tests are based on this version
158+
echo "[info] Compile with Hive 0.13.1"
159+
rm -rf lib_managed
158160
echo "[info] Building Spark with these arguments: $SBT_MAVEN_PROFILES_ARGS"\
159161
" -Phive -Phive-thriftserver"
160162
echo -e "q\n" \
@@ -178,7 +180,7 @@ CURRENT_BLOCK=$BLOCK_SPARK_UNIT_TESTS
178180

179181
if [ -n "$_SQL_TESTS_ONLY" ]; then
180182
# This must be an array of individual arguments. Otherwise, having one long string
181-
#+ will be interpreted as a single test, which doesn't work.
183+
# will be interpreted as a single test, which doesn't work.
182184
SBT_MAVEN_TEST_ARGS=("catalyst/test" "sql/test" "hive/test" "mllib/test")
183185
else
184186
SBT_MAVEN_TEST_ARGS=("test")
@@ -187,11 +189,11 @@ CURRENT_BLOCK=$BLOCK_SPARK_UNIT_TESTS
187189
echo "[info] Running Spark tests with these arguments: $SBT_MAVEN_PROFILES_ARGS ${SBT_MAVEN_TEST_ARGS[@]}"
188190

189191
# NOTE: echo "q" is needed because sbt on encountering a build file with failure
190-
#+ (either resolution or compilation) prompts the user for input either q, r, etc
191-
#+ to quit or retry. This echo is there to make it not block.
192+
# (either resolution or compilation) prompts the user for input either q, r, etc
193+
# to quit or retry. This echo is there to make it not block.
192194
# NOTE: Do not quote $SBT_MAVEN_PROFILES_ARGS or else it will be interpreted as a
193-
#+ single argument!
194-
#+ "${SBT_MAVEN_TEST_ARGS[@]}" is cool because it's an array.
195+
# single argument!
196+
# "${SBT_MAVEN_TEST_ARGS[@]}" is cool because it's an array.
195197
# QUESTION: Why doesn't 'yes "q"' work?
196198
# QUESTION: Why doesn't 'grep -v -e "^\[info\] Resolving"' work?
197199
echo -e "q\n" \
@@ -210,7 +212,7 @@ CURRENT_BLOCK=$BLOCK_PYSPARK_UNIT_TESTS
210212

211213
echo ""
212214
echo "========================================================================="
213-
echo "Detecting binary incompatibilites with MiMa"
215+
echo "Detecting binary incompatibilities with MiMa"
214216
echo "========================================================================="
215217

216218
CURRENT_BLOCK=$BLOCK_MIMA

0 commit comments

Comments
 (0)