You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2019/04/25 17:43:57 UTC
[impala] 01/02: Remove references to the $IMPALA_HOME/thirdparty
directory
This is an automated email from the ASF dual-hosted git repository.
tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 2c45ab093353e1215c08552b2db8c458eb4a0b29
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Mon Apr 22 17:23:38 2019 -0700
Remove references to the $IMPALA_HOME/thirdparty directory
The $IMPALA_HOME/thirdparty directory is a remnant from before
Impala was an Apache project. It is obsolete and unused, so this
removes code that references this directory.
Testing:
- Ran core tests
Change-Id: I2edfd499febb5a25fdcf59b5183eccf192a08be0
Reviewed-on: http://gerrit.cloudera.org:8080/13092
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
README.md | 5 ++---
bin/impala-config.sh | 18 +++++-------------
cmake_modules/FindAvro.cmake | 8 ++------
cmake_modules/FindGFlags.cmake | 10 ++--------
cmake_modules/FindGLog.cmake | 12 ++----------
cmake_modules/FindGTest.cmake | 3 ---
cmake_modules/FindLdap.cmake | 9 +--------
cmake_modules/FindLz4.cmake | 10 ++--------
cmake_modules/FindOrc.cmake | 8 ++------
cmake_modules/FindPProf.cmake | 10 ++--------
cmake_modules/FindRapidJson.cmake | 5 +----
cmake_modules/FindRe2.cmake | 10 ++--------
cmake_modules/FindSasl.cmake | 4 ++--
cmake_modules/FindSnappy.cmake | 10 ++--------
14 files changed, 27 insertions(+), 95 deletions(-)
diff --git a/README.md b/README.md
index 0d700d7..1ea3789 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,7 @@ See bin/bootstrap_build.sh.
### Detailed Build Notes
-Impala can be built with pre-built components, downloaded from S3, or can be
-built with an in-place toolchain located in the thirdparty directory (not recommended).
+Impala can be built with pre-built components or components downloaded from S3.
The components needed to build Impala are Apache Hadoop, Hive, HBase, and Sentry.
If you need to manually override the locations or versions of these components, you
can do so through the environment variables and scripts listed below.
@@ -66,7 +65,7 @@ can do so through the environment variables and scripts listed below.
| IMPALA_TOOLCHAIN | "${IMPALA_HOME}/toolchain" | Native toolchain directory (for compilers, libraries, etc.) |
| SKIP_TOOLCHAIN_BOOTSTRAP | "false" | Skips downloading the toolchain any python dependencies if "true" |
| CDH_BUILD_NUMBER | | Identifier to indicate the CDH build number
-| CDH_COMPONENTS_HOME | "${IMPALA_HOME}/toolchain/cdh_components-${CDH_BUILD_NUMBER}" OR "${IMPALA_HOME}/thirdparty" (if detected) | If a thirdparty directory is present, components found here will override anything in IMPALA_TOOLCHAIN. |
+| CDH_COMPONENTS_HOME | "${IMPALA_HOME}/toolchain/cdh_components-${CDH_BUILD_NUMBER}" | Location of the CDH components within the toolchain. |
| CDH_MAJOR_VERSION | "5" | Identifier used to uniqueify paths for potentially incompatible component builds. |
| IMPALA_CONFIG_SOURCED | "1" | Set by ${IMPALA_HOME}/bin/impala-config.sh (internal use) |
| JAVA_HOME | "/usr/lib/jvm/${JAVA_VERSION}" | Used to locate Java |
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 445c5cc..87b5216 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -250,14 +250,10 @@ export IMPALA_MAVEN_OPTIONS=${IMPALA_MAVEN_OPTIONS-}
# If enabled, debug symbols are added to cross-compiled IR.
export ENABLE_IMPALA_IR_DEBUG_INFO=${ENABLE_IMPALA_IR_DEBUG_INFO-false}
-if [ -d "$IMPALA_HOME/thirdparty" ]; then
- NO_THIRDPARTY=false
-else
- NO_THIRDPARTY=true
-fi
-# If true, download and use the CDH components from S3 instead of the ones
-# in $IMPALA_HOME/thirdparty.
-export DOWNLOAD_CDH_COMPONENTS=${DOWNLOAD_CDH_COMPONENTS-"$NO_THIRDPARTY"}
+# Download and use the CDH components from S3. It can be useful to set this to false if
+# building against a custom local build using HIVE_SRC_DIR_OVERRIDE,
+# HADOOP_INCLUDE_DIR_OVERRIDE, and HADOOP_LIB_DIR_OVERRIDE.
+export DOWNLOAD_CDH_COMPONENTS=${DOWNLOAD_CDH_COMPONENTS-true}
export IS_OSX="$(if [[ "$OSTYPE" == "darwin"* ]]; then echo true; else echo false; fi)"
@@ -487,11 +483,7 @@ export PATH="$IMPALA_TOOLCHAIN/gdb-$IMPALA_GDB_VERSION/bin:$PATH"
export PATH="$IMPALA_HOME/bin:$IMPALA_TOOLCHAIN/cmake-$IMPALA_CMAKE_VERSION/bin/:$PATH"
# The directory in which all the thirdparty CDH components live.
-if [ "${DOWNLOAD_CDH_COMPONENTS}" = true ]; then
- export CDH_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/cdh_components-$CDH_BUILD_NUMBER"
-else
- export CDH_COMPONENTS_HOME="$IMPALA_HOME/thirdparty"
-fi
+export CDH_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/cdh_components-$CDH_BUILD_NUMBER"
# The directory in which all the thirdparty CDP components live.
export CDP_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/cdp_components-$CDP_BUILD_NUMBER"
diff --git a/cmake_modules/FindAvro.cmake b/cmake_modules/FindAvro.cmake
index eaa92cf..48f5b38 100644
--- a/cmake_modules/FindAvro.cmake
+++ b/cmake_modules/FindAvro.cmake
@@ -22,13 +22,9 @@
# AVRO_INCLUDE_DIR, directory containing headers
# AVRO_STATIC_LIB, path to libavrocpp_s.a
# AVRO_FOUND
-set(AVRO_SEARCH_HEADER_PATHS
- ${AVRO_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src)
+set(AVRO_SEARCH_HEADER_PATHS ${AVRO_ROOT}/include)
-set(AVRO_SEARCH_LIB_PATH
- ${AVRO_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/avro-c-$ENV{IMPALA_AVRO_VERSION}/src)
+set(AVRO_SEARCH_LIB_PATH ${AVRO_ROOT}/lib)
find_path(AVRO_INCLUDE_DIR NAMES avro/schema.h schema.h PATHS
${AVRO_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindGFlags.cmake b/cmake_modules/FindGFlags.cmake
index 735cc59..615a3bf 100644
--- a/cmake_modules/FindGFlags.cmake
+++ b/cmake_modules/FindGFlags.cmake
@@ -26,15 +26,9 @@
# GFLAGS_STATIC_LIB, path to libgflags.a
# GFLAGS_SHARED_LIB, path to libgflags.so
-set(GFLAGS_SEARCH_HEADER_PATHS
- ${GFLAGS_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/src
-)
+set(GFLAGS_SEARCH_HEADER_PATHS ${GFLAGS_ROOT}/include)
-set(GFLAGS_SEARCH_LIB_PATH
- ${GFLAGS_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/gflags-$ENV{IMPALA_GFLAGS_VERSION}/.libs
-)
+set(GFLAGS_SEARCH_LIB_PATH ${GFLAGS_ROOT}/lib)
find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h PATHS
${GFLAGS_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindGLog.cmake b/cmake_modules/FindGLog.cmake
index 4e4c93d..999aeee 100644
--- a/cmake_modules/FindGLog.cmake
+++ b/cmake_modules/FindGLog.cmake
@@ -25,16 +25,8 @@
# GLOG_LIBS, directory containing glog libraries
# GLOG_STATIC_LIB, path to libglog.a
-set(THIRDPARTY $ENV{IMPALA_HOME}/thirdparty)
-
-set(GLOG_SEARCH_HEADER_PATHS
- ${GLOG_ROOT}/include
- ${THIRDPARTY}/glog-$ENV{IMPALA_GLOG_VERSION}/src
-)
-set(GLOG_SEARCH_LIB_PATH
- ${GLOG_ROOT}/lib
- ${THIRDPARTY}/glog-$ENV{IMPALA_GLOG_VERSION}/.libs
-)
+set(GLOG_SEARCH_HEADER_PATHS ${GLOG_ROOT}/include)
+set(GLOG_SEARCH_LIB_PATH ${GLOG_ROOT}/lib)
find_path(GLOG_INCLUDE_DIR glog/logging.h PATHS
${GLOG_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake
index a801165..b3d3134 100644
--- a/cmake_modules/FindGTest.cmake
+++ b/cmake_modules/FindGTest.cmake
@@ -34,21 +34,18 @@ set(GTEST_H gtest/gtest.h)
find_path(GTEST_INCLUDE_DIR ${GTEST_H}
PATHS ${GTEST_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/gtest-$ENV{IMPALA_GTEST_VERSION}/include
NO_DEFAULT_PATH
DOC "Path to the ${GTEST_H} file"
)
find_library(GTEST_STATIC_LIB NAMES libgtest.a
PATHS ${GTEST_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/gtest-$ENV{IMPALA_GTEST_VERSION}
NO_DEFAULT_PATH
DOC "Google's framework for writing C++ tests (gtest)"
)
find_library(GTEST_MAIN_LIBRARY NAMES libgtest_main.a
PATHS ${GTEST_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/gtest-$ENV{IMPALA_GTEST_VERSION}
NO_DEFAULT_PATH
DOC "Google's framework for writing C++ tests (gtest_main)"
)
diff --git a/cmake_modules/FindLdap.cmake b/cmake_modules/FindLdap.cmake
index 550f7c4..708c3c4 100644
--- a/cmake_modules/FindLdap.cmake
+++ b/cmake_modules/FindLdap.cmake
@@ -25,17 +25,10 @@
# LDAP_STATIC_LIBRARY, the LDAP library to use.
# LBER_STATIC_LIBRARY, a support library for LDAP.
-set(THIRDPARTY_LDAP $ENV{IMPALA_HOME}/thirdparty/openldap-$ENV{IMPALA_OPENLDAP_VERSION})
-
-set(THIRDPARTY $ENV{IMPALA_HOME}/thirdparty)
-set(LDAP_SEARCH_LIB_PATH
- ${OPENLDAP_ROOT}/lib
- ${THIRDPARTY}/openldap-$ENV{IMPALA_OPENLDAP_VERSION}/impala_install/lib
-)
+set(LDAP_SEARCH_LIB_PATH ${OPENLDAP_ROOT}/lib)
find_path(LDAP_INCLUDE_DIR ldap.h PATHS
${OPENLDAP_ROOT}/include
- ${THIRDPARTY_LDAP}/impala_install/include
NO_DEFAULT_PATH)
find_library(LDAP_STATIC_LIBRARY libldap.a
diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
index 186bbfb..7fbb9e8 100644
--- a/cmake_modules/FindLz4.cmake
+++ b/cmake_modules/FindLz4.cmake
@@ -25,15 +25,9 @@
# LZ4_LIBS, directory containing lz4 libraries
# LZ4_STATIC_LIB, path to liblz4.a
-set(LZ4_SEARCH_LIB_PATH
- ${LZ4_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/lz4
-)
+set(LZ4_SEARCH_LIB_PATH ${LZ4_ROOT}/lib)
-set(LZ4_SEARCH_INCLUDE_DIR
- ${LZ4_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/lz4
-)
+set(LZ4_SEARCH_INCLUDE_DIR ${LZ4_ROOT}/include)
find_path(LZ4_INCLUDE_DIR lz4.h
PATHS ${LZ4_SEARCH_INCLUDE_DIR}
diff --git a/cmake_modules/FindOrc.cmake b/cmake_modules/FindOrc.cmake
index ef06396..90af62f 100644
--- a/cmake_modules/FindOrc.cmake
+++ b/cmake_modules/FindOrc.cmake
@@ -22,13 +22,9 @@
# ORC_INCLUDE_DIR, directory containing headers
# ORC_STATIC_LIB, path to liborc.a
# ORC_FOUND
-set(ORC_SEARCH_HEADER_PATHS
- ${ORC_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/orc-$ENV{IMPALA_ORC_VERSION}/build/include)
+set(ORC_SEARCH_HEADER_PATHS ${ORC_ROOT}/include)
-set(ORC_SEARCH_LIB_PATH
- ${ORC_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/orc-$ENV{IMPALA_ORC_VERSION}/build/lib)
+set(ORC_SEARCH_LIB_PATH ${ORC_ROOT}/lib)
find_path(ORC_INCLUDE_DIR NAMES orc/OrcFile.hh OrcFile.hh PATHS
${ORC_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindPProf.cmake b/cmake_modules/FindPProf.cmake
index b98bcdc..8af7b48 100644
--- a/cmake_modules/FindPProf.cmake
+++ b/cmake_modules/FindPProf.cmake
@@ -26,15 +26,9 @@
# PPROF_STATIC_LIB, path to libprofiler.a
# tcmallocstatic, pprofstatic
-set(PPROF_SEARCH_HEADER_PATHS
- ${GPERFTOOLS_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/gperftools-$ENV{IMPALA_GPERFTOOLS_VERSION}/src
-)
+set(PPROF_SEARCH_HEADER_PATHS ${GPERFTOOLS_ROOT}/include)
-set(PPROF_SEARCH_LIB_PATH
- ${GPERFTOOLS_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/gperftools-$ENV{IMPALA_GPERFTOOLS_VERSION}/.libs
-)
+set(PPROF_SEARCH_LIB_PATH ${GPERFTOOLS_ROOT}/lib)
find_path(PPROF_INCLUDE_DIR google/profiler.h PATHS
${PPROF_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindRapidJson.cmake b/cmake_modules/FindRapidJson.cmake
index d90365f..f6c0657 100644
--- a/cmake_modules/FindRapidJson.cmake
+++ b/cmake_modules/FindRapidJson.cmake
@@ -21,10 +21,7 @@
# RAPIDJSON_ROOT hints the location
# This module defines RAPIDJSON_INCLUDE_DIR, the directory containing headers
-set(RAPIDJSON_SEARCH_HEADER_PATHS
- ${RAPIDJSON_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/rapidjson/include/
-)
+set(RAPIDJSON_SEARCH_HEADER_PATHS ${RAPIDJSON_ROOT}/include)
find_path(RAPIDJSON_INCLUDE_DIR rapidjson/rapidjson.h HINTS
${RAPIDJSON_SEARCH_HEADER_PATHS})
diff --git a/cmake_modules/FindRe2.cmake b/cmake_modules/FindRe2.cmake
index 38dc23a..4c9191d 100644
--- a/cmake_modules/FindRe2.cmake
+++ b/cmake_modules/FindRe2.cmake
@@ -23,15 +23,9 @@
# RE2_INCLUDE_DIR, directory containing headers
# RE2_STATIC_LIB, path to libsnappy.a
-set(RE2_SEARCH_HEADER_PATHS
- ${RE2_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/re2
-)
+set(RE2_SEARCH_HEADER_PATHS ${RE2_ROOT}/include)
-set(RE2_SEARCH_LIB_PATHS
- ${RE2_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/re2/obj
-)
+set(RE2_SEARCH_LIB_PATHS ${RE2_ROOT}/lib)
find_path(RE2_INCLUDE_DIR re2/re2.h
PATHS ${RE2_SEARCH_HEADER_PATHS}
diff --git a/cmake_modules/FindSasl.cmake b/cmake_modules/FindSasl.cmake
index 39455de..4a831f4 100644
--- a/cmake_modules/FindSasl.cmake
+++ b/cmake_modules/FindSasl.cmake
@@ -23,11 +23,11 @@
# CYRUS_SASL_LIB_DEPS other libraries that SASL depends on
# CYRUS_SASL_FOUND, whether Cyrus SASL and its plugins have been found
#
-# N.B: we do _not_ include sasl in thirdparty, for a fairly subtle reason. The
+# N.B: we do _not_ include sasl in the toolchain, for a fairly subtle reason. The
# TLDR version is that newer versions of cyrus-sasl (>=2.1.26) have a bug fix
# for https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590, but that bug fix
# relied on a change both on the plugin side and on the library side. If you
-# then try to run the new version of sasl (e.g from our thirdparty tree) with
+# then try to run the new version of sasl (e.g from our toolchain) with
# an older version of a plugin (eg from RHEL6 install), you'll get a SASL_NOMECH
# error due to this bug.
#
diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
index 4397aa3..ff58d98 100644
--- a/cmake_modules/FindSnappy.cmake
+++ b/cmake_modules/FindSnappy.cmake
@@ -27,15 +27,9 @@
# SNAPPY_FOUND, whether gflags has been found
# snappy - imported static library
-set(SNAPPY_SEARCH_HEADER_PATHS
- ${SNAPPY_ROOT}/include
- $ENV{IMPALA_HOME}/thirdparty/snappy-1.0.5/build/include
-)
+set(SNAPPY_SEARCH_HEADER_PATHS ${SNAPPY_ROOT}/include)
-set(SNAPPY_SEARCH_LIB_PATH
- ${SNAPPY_ROOT}/lib
- $ENV{IMPALA_HOME}/thirdparty/snappy-1.0.5/build/lib
-)
+set(SNAPPY_SEARCH_LIB_PATH ${SNAPPY_ROOT}/lib)
find_path(SNAPPY_INCLUDE_DIR
NAMES snappy.h