mirror of
https://github.com/apache/impala.git
synced 2025-12-30 21:02:41 -05:00
94f67a3432
Before this patch Impala mainly used Thrift 0.9.3, but it was
possible to compile Impala shell with Thrift 0.11.0, so the 0.11.0
Thrift lib was already included in the toolchain.
Most of the changes are related to replacing boost:: with std::
shared_ptr-s in cpp code (this is a continuation of patch by Sahil).
The Thrift upgrade also needs an Impyla release with Thrift 0.11.0, as
Impala's test framework relies on Impyla. A thrift_sasl release is also
needed, because it currently pins Thrift version to 0.9.3 for Python 2.
The current patch uses alpha releases from Impyla and thrift_sasl that
use thrift 0.11.0.
Notable side effects:
- old logic to compile thrift for impala-shell with 0.11.0 was removed
- impala_shell's utf8 handling had to be updated as the new 0.11.0
compilation happens with no_utf8strings. This also made things a
bit faster, e.g the following is ~0.22s instead of ~0.25
shell/impala_shell.py \
-B -q "select * from functional_parquet.alltypes;" > /dev/null
- THRIFT-3921 changed the stream operators to print an enum's name
instead of its number, leading to slightly different messages
in some cases.
- "templates" was added to the thift generator's parameters to avoid
a compilation issue (related to IMPALA-10600). I didn't notice any
change in compilation time. This option generated .tcc files with
templetized readers/writers for Thrift types. Currently we don't
use these, but they could potentially speed up (de)serialization.
Testing:
- ran Impyla's test suite with Python 2 and 3
- ran core tests
Change-Id: Idd13f177b4f7acc07872ea6399035aa180ef6ab6
Reviewed-on: http://gerrit.cloudera.org:8080/17170
Reviewed-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
95 lines
3.6 KiB
Bash
Executable File
95 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# ----------------------------------------------------------------------
|
|
# This script is invoked during the Impala build process, and creates
|
|
# a distributable python package of the Impala shell. The resulting
|
|
# archive will be saved to:
|
|
#
|
|
# ${IMPALA_HOME}/shell/dist/impala_shell-<version>.tar.gz
|
|
#
|
|
# Until the thrift-generated python files in ${IMPALA_HOME}/shell/gen-py
|
|
# have been created by the build process, this script will not work.
|
|
# It also relies upon the impala_build_version.py file created by the
|
|
# parent packaging script, ${IMPALA_HOME}/shell/make_shell_tarball.sh,
|
|
# which needs to be run before this script will work.
|
|
#
|
|
# After those files exist, however, this script can be run again at will.
|
|
|
|
set -eu -o pipefail
|
|
|
|
WORKING_DIR="$(cd "$(dirname "$0")" ; pwd -P )"
|
|
SHELL_HOME="${IMPALA_HOME}"/shell
|
|
STAGING_DIR="${WORKING_DIR}"/staging
|
|
DIST_DIR="${DIST_DIR:-$WORKING_DIR/dist}"
|
|
PACKAGE_DIR="${STAGING_DIR}"/impala_shell_package
|
|
MODULE_LIB_DIR="${PACKAGE_DIR}"/impala_shell
|
|
NO_CLEAN_DIST="${NO_CLEAN_DIST:-}"
|
|
|
|
THRIFT_GEN_PY_DIR=${SHELL_HOME}/gen-py
|
|
THRIFT_PY_ROOT="${IMPALA_TOOLCHAIN_PACKAGES_HOME}/thrift-${IMPALA_THRIFT_VERSION}"
|
|
|
|
assemble_package_files() {
|
|
mkdir -p "${MODULE_LIB_DIR}"
|
|
|
|
cp -r "${THRIFT_GEN_PY_DIR}"/* "${MODULE_LIB_DIR}"
|
|
cp -r "${THRIFT_PY_ROOT}/python/lib/python2.7/site-packages/thrift" "${MODULE_LIB_DIR}"
|
|
|
|
cp "${WORKING_DIR}/__init__.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/compatibility.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/impala_shell.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/impala_client.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/option_parser.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/shell_output.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/impala_shell_config_defaults.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/TSSLSocketWithWildcardSAN.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/ImpalaHttpClient.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/shell_exceptions.py" "${MODULE_LIB_DIR}"
|
|
cp "${SHELL_HOME}/cookie_util.py" "${MODULE_LIB_DIR}"
|
|
|
|
cp "${SHELL_HOME}/packaging/README.md" "${PACKAGE_DIR}"
|
|
cp "${SHELL_HOME}/packaging/MANIFEST.in" "${PACKAGE_DIR}"
|
|
cp "${SHELL_HOME}/packaging/requirements.txt" "${PACKAGE_DIR}"
|
|
cp "${SHELL_HOME}/packaging/setup.py" "${PACKAGE_DIR}"
|
|
|
|
cp "${IMPALA_HOME}/LICENSE.txt" "${PACKAGE_DIR}"
|
|
}
|
|
|
|
create_distributable_python_package() {
|
|
# Generate a new python package tarball in ${IMPALA_HOME}/shell/dist
|
|
if [[ "${NO_CLEAN_DIST}" != "true" ]]; then
|
|
rm -rf "${DIST_DIR}"
|
|
fi
|
|
|
|
mkdir -p "${DIST_DIR}"
|
|
|
|
pushd "${PACKAGE_DIR}"
|
|
echo "Building package..."
|
|
PACKAGE_TYPE="${PACKAGE_TYPE:-}" OFFICIAL="${OFFICIAL:-}" \
|
|
python setup.py sdist --dist-dir "${DIST_DIR}"
|
|
popd
|
|
|
|
if [[ "${NO_CLEAN_DIST}" != "true" ]]; then
|
|
rm -rf "${STAGING_DIR}"
|
|
fi
|
|
}
|
|
|
|
assemble_package_files
|
|
create_distributable_python_package
|