Repository: kudu
Updated Branches:
refs/heads/master 368990140 -> 60020cf32
Bump Hive version, normalize hive package name
This commit bumps the Hive version in thirdparty, and strips the
'apache' prefix and 'bin' suffix from the thirdparty tarball package,
which brings it inline with the hadoop package naming.
Change-Id: I5cf6696e2a49986aba025f13653dc549e6fc5beb
Reviewed-on: http://gerrit.cloudera.org:8080/11277
Reviewed-by: Adar Dembo
Reviewed-by: Hao Hao
Tested-by: Dan Burkert
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/60020cf3
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/60020cf3
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/60020cf3
Branch: refs/heads/master
Commit: 60020cf329aed49624a9a3e4001c3fe4f55816f5
Parents: 3689901
Author: Dan Burkert
Authored: Mon Aug 20 14:27:45 2018 -0700
Committer: Dan Burkert
Committed: Tue Aug 21 20:19:00 2018 +
--
build-support/run_dist_test.py | 2 +-
thirdparty/package-hive.sh | 7 +--
thirdparty/vars.sh | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/kudu/blob/60020cf3/build-support/run_dist_test.py
--
diff --git a/build-support/run_dist_test.py b/build-support/run_dist_test.py
index 5c98299..624ec80 100755
--- a/build-support/run_dist_test.py
+++ b/build-support/run_dist_test.py
@@ -138,7 +138,7 @@ def main():
# Add environment variables for Java dependencies. These environment
variables
# are used in mini_hms.cc.
- env['HIVE_HOME'] = glob.glob(os.path.join(ROOT,
"thirdparty/src/apache-hive-*-bin"))[0]
+ env['HIVE_HOME'] = glob.glob(os.path.join(ROOT, "thirdparty/src/hive-*"))[0]
env['HADOOP_HOME'] = glob.glob(os.path.join(ROOT,
"thirdparty/src/hadoop-*"))[0]
env['JAVA_HOME'] = glob.glob("/usr/lib/jvm/java-1.8.0-*")[0]
http://git-wip-us.apache.org/repos/asf/kudu/blob/60020cf3/thirdparty/package-hive.sh
--
diff --git a/thirdparty/package-hive.sh b/thirdparty/package-hive.sh
index d528806..5eedde5 100755
--- a/thirdparty/package-hive.sh
+++ b/thirdparty/package-hive.sh
@@ -34,7 +34,7 @@ set -eux
ARTIFACT=apache-hive-$VERSION-bin
-wget https://archive.apache.org/dist/hive/hive-$VERSION/$ARTIFACT.tar.gz
+curl --retry 3 -L -O
https://archive.apache.org/dist/hive/hive-$VERSION/$ARTIFACT.tar.gz
tar xf $ARTIFACT.tar.gz
for PROJECT in accumulo aether avatica calcite curator druid groovy hbase
icu4j jetty jsp maven parquet zookeeper; do
@@ -47,4 +47,7 @@ rm -rf $ARTIFACT/lib/php
rm -rf $ARTIFACT/lib/python
rm -rf $ARTIFACT/lib/py
-tar czf $ARTIFACT-stripped.tar.gz $ARTIFACT
+# Remove the 'apache-' prefix and '-bin' suffix in order to normalize the
+# tarball with Hadoop and the rest of our thirdparty dependencies.
+mv $ARTIFACT hive-$VERSION
+tar czf hive-$VERSION-stripped.tar.gz hive-$VERSION
http://git-wip-us.apache.org/repos/asf/kudu/blob/60020cf3/thirdparty/vars.sh
--
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 0483906..2804bb3 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -212,8 +212,8 @@ BISON_SOURCE=$TP_SOURCE_DIR/$BISON_NAME
# are published. The SHA below is the current head of branch-2.
# Note: The Hive release binary tarball is stripped of unnecessary jars before
# being uploaded. See thirdparty/package-hive.sh for details.
-HIVE_VERSION=c0a57a33b44d73fbe0f95256f0a3822bd3720aa8
-HIVE_NAME=apache-hive-$HIVE_VERSION-bin
+HIVE_VERSION=498021fa15186aee8b282d3c032fbd2cede6bec4
+HIVE_NAME=hive-$HIVE_VERSION
HIVE_SOURCE=$TP_SOURCE_DIR/$HIVE_NAME
# Note: The Hadoop release tarball is stripped of unnecessary jars before being
