IMPALA-5986: Correct set-option logic to recognize digits in names. Arose during work for IMPALA-5376; prevents tests from passing consistently.
Change-Id: Ia3ba641553ff827dbd4673b9fe7ed7d9d5e83052 Reviewed-on: http://gerrit.cloudera.org:8080/8166 Reviewed-by: Michael Brown <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/1969c56c Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/1969c56c Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/1969c56c Branch: refs/heads/master Commit: 1969c56c2fba248794d4d52eae4410998afa0709 Parents: a93b7c5 Author: Tim Wood <[email protected]> Authored: Thu Sep 28 10:44:23 2017 -0700 Committer: Impala Public Jenkins <[email protected]> Committed: Fri Sep 29 01:50:31 2017 +0000 ---------------------------------------------------------------------- tests/common/impala_test_suite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/1969c56c/tests/common/impala_test_suite.py ---------------------------------------------------------------------- diff --git a/tests/common/impala_test_suite.py b/tests/common/impala_test_suite.py index b0857e9..0732695 100644 --- a/tests/common/impala_test_suite.py +++ b/tests/common/impala_test_suite.py @@ -99,8 +99,8 @@ TARGET_FILESYSTEM = os.getenv("TARGET_FILESYSTEM") or "hdfs" IMPALA_HOME = os.getenv("IMPALA_HOME") EE_TEST_LOGS_DIR = os.getenv("IMPALA_EE_TEST_LOGS_DIR") # Match any SET statement. Assume that query options' names -# only contain alphabets and underscores. -SET_PATTERN = re.compile(r'\s*set\s*([a-zA-Z_]+)=*', re.I) +# only contain alphabets, underscores and digits after position 1. +SET_PATTERN = re.compile(r'\s*set\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*=*', re.I) # Base class for Impala tests. All impala test cases should inherit from this class class ImpalaTestSuite(BaseTestSuite):
