You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2019/05/03 17:06:42 UTC
[impala] 03/03: Bump CDP_BUILD_NUMBER to 1056671
This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 99e1a39b908b81a94ef8cf4b41458c388a34755c
Author: Vihang Karajgaonkar <vi...@cloudera.com>
AuthorDate: Wed May 1 19:07:40 2019 -0700
Bump CDP_BUILD_NUMBER to 1056671
This change bumps the CDP_BUILD_NUMBER to 1056671 which includes all the
Hive and Tez patches required for building against Hive 3. With this
change we get rid of the custom builds for Hive and Tez introduced in
IMPALA-8369 and switch to more official sources of builds for the
minicluster.
Notes:
1. The tarball names and the directory to which they extract to changed
from the previous CDP_BUILD_NUMBER. Due to this we need to change the
bootstrap_toolchain and impala-config.sh so that the Hive environment
variables are set correctly.
Testing Done:
1. Built against Hive-3 and Hive-2 using the flag USE_CDP_HIVE
2. Did basic testing from Impala and Beeline for the testing the tez
patch
3. Currently running the full-suite of tests to make sure there are no
regressions
Change-Id: Ic758a15b33e89b6804c12356aac8e3f230e07ae0
Reviewed-on: http://gerrit.cloudera.org:8080/13213
Reviewed-by: Fredy Wijaya <fw...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/bootstrap_toolchain.py | 2 +-
bin/impala-config.sh | 23 ++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py
index 9bfd6c8..6a6eeb7 100755
--- a/bin/bootstrap_toolchain.py
+++ b/bin/bootstrap_toolchain.py
@@ -570,7 +570,7 @@ if __name__ == "__main__":
]
use_cdp_hive = os.getenv("USE_CDP_HIVE") == "true"
if use_cdp_hive:
- cdp_components.append(CdpComponent("apache-hive-{0}-src"
+ cdp_components.append(CdpComponent("hive-{0}-source"
.format(os.environ.get("IMPALA_HIVE_VERSION")))),
cdp_components.append(CdpComponent("apache-hive-{0}-bin"
.format(os.environ.get("IMPALA_HIVE_VERSION")))),
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 5eeb254..cc8cfef 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -161,21 +161,18 @@ fi
export IMPALA_TOOLCHAIN_HOST
export CDH_MAJOR_VERSION=6
export CDH_BUILD_NUMBER=1055188
-export CDP_BUILD_NUMBER=1013201
+export CDP_BUILD_NUMBER=1056671
export IMPALA_HADOOP_VERSION=3.0.0-cdh6.x-SNAPSHOT
export IMPALA_HBASE_VERSION=2.1.0-cdh6.x-SNAPSHOT
export IMPALA_SENTRY_VERSION=2.1.0-cdh6.x-SNAPSHOT
-export IMPALA_RANGER_VERSION=1.2.0.6.0.99.0-45
+export IMPALA_RANGER_VERSION=1.2.0.6.0.99.0-147
export IMPALA_PARQUET_VERSION=1.9.0-cdh6.x-SNAPSHOT
export IMPALA_AVRO_JAVA_VERSION=1.8.2-cdh6.x-SNAPSHOT
export IMPALA_LLAMA_MINIKDC_VERSION=1.0.0
export IMPALA_KITE_VERSION=1.0.0-cdh6.x-SNAPSHOT
export KUDU_JAVA_VERSION=1.10.0-cdh6.x-SNAPSHOT
export CDH_HIVE_VERSION=2.1.1-cdh6.x-SNAPSHOT
-# This is a custom build of Hive which includes patches for HIVE-21586
-# HIVE-21077, HIVE-21526, HIVE-21561
-# TODO Use a official once these patches are merged
-export CDP_HIVE_VERSION=3.1.0.6.0.99.0-38-0e7f6337a50
+export CDP_HIVE_VERSION=3.1.0.6.0.99.0-147
# When IMPALA_(CDH_COMPONENT)_URL are overridden, they may contain '$(platform_label)'
# which will be substituted for the CDH platform label in bootstrap_toolchain.py
@@ -202,15 +199,7 @@ if $USE_CDP_HIVE; then
# When USE_CDP_HIVE is set we use the CDP hive version to build as well as deploy in
# the minicluster
export IMPALA_HIVE_VERSION=${CDP_HIVE_VERSION}
- # Temporary version of Tez, patched with the fix for TEZ-1348:
- # https://github.com/apache/tez/pull/40
- # We'll switch to a non-"todd" version of Tez once that fix is integrated.
- # For now, if you're bumping the CDP build number, you'll need to download
- # this tarball from an earlier build and re-upload it to the new directory
- # in the toolchain bucket.
- #
- # TODO(todd) switch to an official build.
- export IMPALA_TEZ_VERSION=0.10.0-todd-6fcc41e5798b.1
+ export IMPALA_TEZ_VERSION=0.9.1.6.0.99.0-147
else
# CDH hive version is used to build and deploy in minicluster when USE_CDP_HIVE is
# false
@@ -311,8 +300,8 @@ export LOCAL_FS="file:${WAREHOUSE_LOCATION_PREFIX}"
ESCAPED_IMPALA_HOME=$(sed "s/[^0-9a-zA-Z]/_/g" <<< "$IMPALA_HOME")
if $USE_CDP_HIVE; then
export HIVE_HOME="$CDP_COMPONENTS_HOME/apache-hive-${IMPALA_HIVE_VERSION}-bin"
- export HIVE_SRC_DIR=${HIVE_SRC_DIR_OVERRIDE:-"${CDP_COMPONENTS_HOME}/apache-hive-\
-${IMPALA_HIVE_VERSION}-src"}
+ export HIVE_SRC_DIR=${HIVE_SRC_DIR_OVERRIDE:-"${CDP_COMPONENTS_HOME}/hive-\
+${IMPALA_HIVE_VERSION}"}
# Set the path to the hive_metastore.thrift which is used to build thrift code
export HIVE_METASTORE_THRIFT_DIR=$HIVE_SRC_DIR/standalone-metastore/src/main/thrift
# It is likely that devs will want to work with both the versions of metastore