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 2022/02/07 18:38:33 UTC
[impala] branch master updated (6c845eb -> 5090c44)
This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git.
from 6c845eb IMPALA-10046: Switch backend to compile with DWARF 4 debug info
new d34039c IMPALA-11096: Strict_hs2 mode in impala-shell does not support get_summary
new 5090c44 IMPALA-11103: Switch to CMake 3.22.2 to avoid boost warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/impala-config.sh | 6 +++---
shell/impala_shell.py | 17 +++++++++++++--
shell/option_parser.py | 7 +++++++
tests/shell/test_shell_interactive.py | 39 ++++++++++++++++++++++++++++-------
4 files changed, 56 insertions(+), 13 deletions(-)
[impala] 02/02: IMPALA-11103: Switch to CMake 3.22.2 to avoid boost warnings
Posted by 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
commit 5090c44eff956b2a4705d9441bb3f29a0ea93b59
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Thu Feb 3 16:46:22 2022 -0800
IMPALA-11103: Switch to CMake 3.22.2 to avoid boost warnings
With the recent upgrade of boost to 1.74, CMake's FindBoost
now produces some warnings like:
CMake Warning at cmake-3.14.3/share/cmake-3.14/Modules/FindBoost.cmake:905 (message):
New Boost version may have incorrect or missing dependencies and imported
targets
This upgrades CMake 3.22.2, which has support for newer Boost
versions. With the new CMake, the warning goes away.
This also upgrades ORC to 1.7.0-p6.
Testing:
- Ran core tests
Change-Id: I1d59b346c0def5bbd3580f81438c78dbc16948e7
Reviewed-on: http://gerrit.cloudera.org:8080/18199
Reviewed-by: Wenzhe Zhou <wz...@cloudera.com>
Reviewed-by: Quanlong Huang <hu...@gmail.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/impala-config.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 9e19c5f..3cf2258 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -68,7 +68,7 @@ fi
# moving to a different build of the toolchain, e.g. when a version is bumped or a
# compile option is changed. The build id can be found in the output of the toolchain
# build jobs, it is constructed from the build number and toolchain git hash prefix.
-export IMPALA_TOOLCHAIN_BUILD_ID=81-db38b5fb38
+export IMPALA_TOOLCHAIN_BUILD_ID=109-ae66315534
# Versions of toolchain dependencies.
# -----------------------------------
export IMPALA_AVRO_VERSION=1.7.4-p5
@@ -83,7 +83,7 @@ export IMPALA_BZIP2_VERSION=1.0.8-p2
unset IMPALA_BZIP2_URL
export IMPALA_CCTZ_VERSION=2.2
unset IMPALA_CCTZ_URL
-export IMPALA_CMAKE_VERSION=3.14.3
+export IMPALA_CMAKE_VERSION=3.22.2
unset IMPALA_CMAKE_URL
export IMPALA_CRCUTIL_VERSION=440ba7babeff77ffad992df3a10c767f184e946e-p2
unset IMPALA_CRCUTIL_URL
@@ -136,7 +136,7 @@ export IMPALA_OPENLDAP_VERSION=2.4.47
unset IMPALA_OPENLDAP_URL
export IMPALA_OPENSSL_VERSION=1.0.2l
unset IMPALA_OPENSSL_URL
-export IMPALA_ORC_VERSION=1.7.0-p5
+export IMPALA_ORC_VERSION=1.7.0-p6
unset IMPALA_ORC_URL
export IMPALA_PROTOBUF_VERSION=3.14.0
unset IMPALA_PROTOBUF_URL
[impala] 01/02: IMPALA-11096: Strict_hs2 mode in impala-shell does not support get_summary
Posted by 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
commit d34039ced95f48497482a02c329da1a7c504055e
Author: Steve Carlin <sc...@cloudera.com>
AuthorDate: Fri Jan 28 14:50:17 2022 -0800
IMPALA-11096: Strict_hs2 mode in impala-shell does not support get_summary
The get_summary() thrift call is not supported in strict_hs2 mode
on impala-shell. The live_progress and live_summary options are
disabled when the strict_hs2_protocol flag is set.
Change-Id: I6aee838a80b4659a13a0a0cb9eabffa2c8767c8f
Reviewed-on: http://gerrit.cloudera.org:8080/18177
Tested-by: Impala Public Jenkins <im...@cloudera.com>
Reviewed-by: Csaba Ringhofer <cs...@cloudera.com>
---
shell/impala_shell.py | 17 +++++++++++++--
shell/option_parser.py | 7 +++++++
tests/shell/test_shell_interactive.py | 39 ++++++++++++++++++++++++++++-------
3 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/shell/impala_shell.py b/shell/impala_shell.py
index c6ab51c..8ad00f7 100755
--- a/shell/impala_shell.py
+++ b/shell/impala_shell.py
@@ -231,8 +231,21 @@ class ImpalaShell(cmd.Cmd, object):
# Tracks query handle of the last query executed. Used by the 'profile' command.
self.last_query_handle = None;
- self.live_summary = options.live_summary
- self.live_progress = options.live_progress
+ # live_summary and live_progress are turned off in strict_hs2_protocol mode
+ if options.strict_hs2_protocol:
+ if options.live_summary:
+ warning = "WARNING: Unable to track live summary with strict_hs2_protocol"
+ print(warning, file=sys.stderr)
+ if options.live_progress:
+ warning = "WARNING: Unable to track live progress with strict_hs2_protocol"
+ print(warning, file=sys.stderr)
+
+ # do not allow live_progress or live_summary to be changed.
+ self.VALID_SHELL_OPTIONS['LIVE_PROGRESS'] = (lambda x: x in (), "live_progress")
+ self.VALID_SHELL_OPTIONS['LIVE_SUMMARY'] = (lambda x: x in (), "live_summary")
+
+ self.live_summary = options.live_summary and not options.strict_hs2_protocol
+ self.live_progress = options.live_progress and not options.strict_hs2_protocol
self.ignore_query_failure = options.ignore_query_failure
diff --git a/shell/option_parser.py b/shell/option_parser.py
index 91c32b2..272b633 100755
--- a/shell/option_parser.py
+++ b/shell/option_parser.py
@@ -355,6 +355,13 @@ def get_option_parser(defaults):
if '--live_progress' in sys.argv and '--disable_live_progress' in sys.argv:
parser.error("options --live_progress and --disable_live_progress are mutually "
"exclusive")
+
+ if '--strict_hs2_protocol' in sys.argv:
+ if '--live_progress' in sys.argv:
+ parser.error("options --strict_hs2_protocol does not support --live_progress")
+ if '--live_summary' in sys.argv:
+ parser.error("options --strict_hs2_protocol does not support --live_summary")
+
if '--verbose' in sys.argv and '--quiet' in sys.argv:
parser.error("options --verbose and --quiet are mutually exclusive")
diff --git a/tests/shell/test_shell_interactive.py b/tests/shell/test_shell_interactive.py
index 756cff3..2d1a4aa 100755
--- a/tests/shell/test_shell_interactive.py
+++ b/tests/shell/test_shell_interactive.py
@@ -194,14 +194,24 @@ class TestImpalaShellInteractive(ImpalaTestSuite):
"""Test that setting the local shell options works"""
proc = spawn_shell(get_shell_cmd(vector))
proc.expect(":{0}] default>".format(get_impalad_port(vector)))
- self._expect_with_cmd(proc, "set", vector,
- ("LIVE_PROGRESS: True", "LIVE_SUMMARY: False"))
- self._expect_with_cmd(proc, "set live_progress=true", vector)
- self._expect_with_cmd(proc, "set", vector,
- ("LIVE_PROGRESS: True", "LIVE_SUMMARY: False"))
- self._expect_with_cmd(proc, "set live_summary=1", vector)
- self._expect_with_cmd(proc, "set", vector,
- ("LIVE_PROGRESS: True", "LIVE_SUMMARY: True"))
+ if vector.get_value('strict_hs2_protocol'):
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: False", "LIVE_SUMMARY: False"))
+ self._expect_with_cmd(proc, "set live_progress=true", vector)
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: False", "LIVE_SUMMARY: False"))
+ self._expect_with_cmd(proc, "set live_summary=1", vector)
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: False", "LIVE_SUMMARY: False"))
+ else:
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: True", "LIVE_SUMMARY: False"))
+ self._expect_with_cmd(proc, "set live_progress=true", vector)
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: True", "LIVE_SUMMARY: False"))
+ self._expect_with_cmd(proc, "set live_summary=1", vector)
+ self._expect_with_cmd(proc, "set", vector,
+ ("LIVE_PROGRESS: True", "LIVE_SUMMARY: True"))
self._expect_with_cmd(proc, "set", vector,
("WRITE_DELIMITED: False", "VERBOSE: True"))
self._expect_with_cmd(proc, "set", vector,
@@ -686,6 +696,19 @@ class TestImpalaShellInteractive(ImpalaTestSuite):
result = run_impala_shell_interactive(vector, cmds, shell_args=args)
assert "\tLIVE_PROGRESS: False" in result.stdout
+ def test_commandline_flag_strict_hs2_protocol(self, vector):
+ """Test the command line flag strict_hs2_protocol that it disables
+ live_progress and live_summary"""
+ if not vector.get_value('strict_hs2_protocol'):
+ pytest.skip("Test only applies to strict_hs2_protocol.")
+
+ cmds = "set all;"
+ # override the default option through command line argument.
+ args = ['--strict_h2_protocol']
+ result = run_impala_shell_interactive(vector, cmds, shell_args=args)
+ assert "\tLIVE_PROGRESS: False" in result.stdout
+ assert "\tLIVE_SUMMARY: False" in result.stdout
+
def test_live_option_configuration(self, vector):
"""Test the optional configuration file with live_progress and live_summary."""
# Positive tests