[impala] branch master updated: IMPALA-9642: Set USE_CDP_HIVE to true by default

[jo...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 8749d58  IMPALA-9642: Set USE_CDP_HIVE to true by default
8749d58 is described below

commit 8749d5874350772cd745e6a2359f45a13537050e
Author: Sahil Takiar <ta...@gmail.com>
AuthorDate: Wed Apr 8 12:02:49 2020 -0700

    IMPALA-9642: Set USE_CDP_HIVE to true by default
    
    Sets the default value for USE_CDP_HIVE to true instead of false. This
    means that by default all asf builds and tests will run with
    USE_CDP_HIVE=true. This also modifies build-all-flag-combinations.sh
    to use USE_CDP_HIVE=true for all builds except one sanity check for
    USE_CDP_HIVE=false. This is the reverse of the current behavior.
    The USE_CDP_HIVE=false build can be removed in a subsequent change.
    
    Testing:
    * Ran exhaustive tests
    
    Change-Id: I8549c7065de7eecf74f7437fe9d1ff2bf1bfe9f3
    Reviewed-on: http://gerrit.cloudera.org:8080/15710
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
---
 bin/impala-config.sh                       | 2 +-
 bin/jenkins/build-all-flag-combinations.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 7dbbefd..256b097 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -230,7 +230,7 @@ export CDP_RANGER_URL=${CDP_RANGER_URL-}
 
 export CDH_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/cdh_components-$CDH_BUILD_NUMBER"
 export CDP_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/cdp_components-$CDP_BUILD_NUMBER"
-export USE_CDP_HIVE=${USE_CDP_HIVE-false}
+export USE_CDP_HIVE=${USE_CDP_HIVE-true}
 export DISABLE_SENTRY=${DISABLE_SENTRY_OVERRIDE:-"true"}
 if $USE_CDP_HIVE; then
   # When USE_CDP_HIVE is set we use the CDP hive version to build as well as deploy in
diff --git a/bin/jenkins/build-all-flag-combinations.sh b/bin/jenkins/build-all-flag-combinations.sh
index 6c2edd5..1938146 100755
--- a/bin/jenkins/build-all-flag-combinations.sh
+++ b/bin/jenkins/build-all-flag-combinations.sh
@@ -43,7 +43,7 @@ CONFIGS=(
   "-skiptests -noclean -tsan"
   "-skiptests -noclean -ubsan -so -ninja"
   # USE_CDP_HIVE=true build:
-  "-skiptests -noclean -use_cdp_hive"
+  "-skiptests -noclean -use_cdh_hive"
 )
 
 FAILED=""
@@ -58,12 +58,12 @@ trap onexit EXIT
 mkdir -p ${TMP_DIR}
 
 for CONFIG in "${CONFIGS[@]}"; do
-  CONFIG2=${CONFIG/-use_cdp_hive/}
+  CONFIG2=${CONFIG/-use_cdh_hive/}
   if [[ "$CONFIG" != "$CONFIG2" ]]; then
     CONFIG=$CONFIG2
-    export USE_CDP_HIVE=true
-  else
     export USE_CDP_HIVE=false
+  else
+    export USE_CDP_HIVE=true
   fi
   DESCRIPTION="Options $CONFIG USE_CDP_HIVE=$USE_CDP_HIVE"