mirror of
https://github.com/apache/impala.git
synced 2025-12-19 09:58:28 -05:00
1913ab46ed
To remove the dependency on Python 2, existing scripts need to use python3 rather than python. These commands find those locations (for impala-python and regular python): git grep impala-python | grep -v impala-python3 | grep -v impala-python-common | grep -v init-impala-python git grep bin/python | grep -v python3 This removes or switches most of these locations by various means: 1. If a python file has a #!/bin/env impala-python (or python) but doesn't have a main function, it removes the hash-bang and makes sure that the file is not executable. 2. Most scripts can simply switch from impala-python to impala-python3 (or python to python3) with minimal changes. 3. The cm-api pypi package (which doesn't support Python 3) has been replaced by the cm-client pypi package and interfaces have changed. Rather than migrating the code (which hasn't been used in years), this deletes the old code and stops installing cm-api into the virtualenv. The code can be restored and revamped if there is any interest in interacting with CM clusters. 4. This switches tests/comparison over to impala-python3, but this code has bit-rotted. Some pieces can be run manually, but it can't be fully verified with Python 3. It shouldn't hold back the migration on its own. 5. This also replaces locations of impala-python in comments / documentation / READMEs. 6. kazoo (used for interacting with HBase) needed to be upgraded to a version that supports Python 3. The newest version of kazoo requires upgrades of other component versions, so this uses kazoo 2.8.0 to avoid needing other upgrades. The two remaining uses of impala-python are: - bin/cmake_aux/create_virtualenv.sh - bin/impala-env-versioned-python These will be removed separately when we drop Python 2 support completely. In particular, these are useful for testing impala-shell with Python 2 until we stop supporting Python 2 for impala-shell. The docker-based tests still use /usr/bin/python, but this can be switched over independently (and doesn't impact impala-python) Testing: - Ran core job - Ran build + dataload on Centos 7, Redhat 8 - Manual testing of individual scripts (except some bitrotted areas like the random query generator) Change-Id: If209b761290bc7e7c716c312ea757da3e3bca6dc Reviewed-on: http://gerrit.cloudera.org:8080/23468 Reviewed-by: Michael Smith <michael.smith@cloudera.com> Tested-by: Michael Smith <michael.smith@cloudera.com>
128 lines
4.5 KiB
Python
Executable File
128 lines
4.5 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# This uses system python to avoid a dependency on impala-python3,
|
|
# because this runs during the build.
|
|
#
|
|
# 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 generates be/src/common/version.h which contains the build version based
|
|
# on the git hash.
|
|
|
|
from __future__ import absolute_import, division, print_function
|
|
import os
|
|
from subprocess import call
|
|
|
|
IMPALA_HOME = os.environ['IMPALA_HOME']
|
|
SAVE_VERSION_SCRIPT = os.path.join(IMPALA_HOME, 'bin/save-version.sh')
|
|
VERSION_FILE_NAME = os.path.join(IMPALA_HOME, 'bin/version.info')
|
|
VERSION_CC_FILE_NAME = os.path.join(IMPALA_HOME, 'be/src/common/version.cc')
|
|
|
|
# Redirecting stdout and stderr to os.devnull as we don't want unnecessary output.
|
|
devnull = open(os.devnull, 'w')
|
|
try:
|
|
# Force git to look at a git directory relative to IMPALA_HOME,
|
|
# so as to avoid accidentally getting another repo's git hashes.
|
|
can_obtain_git_hash = \
|
|
call(['git', '--git-dir', os.path.join(IMPALA_HOME, ".git"), 'rev-parse', 'HEAD'],
|
|
stdout=devnull, stderr=devnull) == 0
|
|
finally:
|
|
devnull.close()
|
|
|
|
version_file_exists = os.path.isfile(VERSION_FILE_NAME)
|
|
|
|
# If we have a version file and cannot obtain a git hash, skip generating a new
|
|
# version file.
|
|
if version_file_exists and not can_obtain_git_hash:
|
|
print("Cannot obtain git hash, using existing version file.")
|
|
else:
|
|
# Remove existing version files only if they exist.
|
|
# TODO: Might be useful to make a common utility function remove_if_clean.
|
|
if version_file_exists:
|
|
print('Removing existing file: %s' % (VERSION_FILE_NAME))
|
|
os.remove(VERSION_FILE_NAME)
|
|
if os.path.isfile(VERSION_CC_FILE_NAME):
|
|
print('Removing existing file: %s' % (VERSION_CC_FILE_NAME))
|
|
os.remove(VERSION_CC_FILE_NAME)
|
|
|
|
# SAVE_VERSION_SCRIPT will generate a dummy version.info file if we cannot obtain the
|
|
# git hash.
|
|
# Generate a new version file.
|
|
os.system(SAVE_VERSION_SCRIPT)
|
|
|
|
# version.info file has the format:
|
|
# VERSION: <version>
|
|
# GIT_HASH: <git has>
|
|
# BUILD_TIME: <build time>
|
|
version, git_hash, build_time = [None, None, None]
|
|
version_file = open(VERSION_FILE_NAME)
|
|
try:
|
|
version, git_hash, build_time = [line.split(':',1)[-1].strip() \
|
|
for line in version_file.readlines() if not line.startswith('#') ]
|
|
finally:
|
|
version_file.close()
|
|
|
|
print('\n'.join([version, git_hash, build_time]))
|
|
|
|
file_contents = """
|
|
//
|
|
// 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 is a generated file, DO NOT EDIT IT.
|
|
// To change this file, see impala/bin/gen_build_version.py
|
|
|
|
#include "common/version.h"
|
|
|
|
#define IMPALA_BUILD_VERSION "%(build_version)s"
|
|
#define IMPALA_BUILD_HASH "%(build_hash)s"
|
|
#define IMPALA_BUILD_TIME "%(build_time)s"
|
|
|
|
const char* GetDaemonBuildVersion() {
|
|
return IMPALA_BUILD_VERSION;
|
|
}
|
|
|
|
const char* GetDaemonBuildHash() {
|
|
return IMPALA_BUILD_HASH;
|
|
}
|
|
|
|
const char* GetDaemonBuildTime() {
|
|
return IMPALA_BUILD_TIME;
|
|
}
|
|
""" % {'build_version': version,
|
|
'build_hash': git_hash,
|
|
'build_time': build_time}
|
|
file_contents = file_contents.strip()
|
|
|
|
# Generate a new version file.
|
|
version_file = open(VERSION_CC_FILE_NAME, "w")
|
|
version_file.write(file_contents)
|
|
version_file.close()
|