This is an automated email from the ASF dual-hosted git repository. michaelsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 8b2598cd7036f4c57fd2d54a08da6b22ac25b032 Author: Michael Smith <[email protected]> AuthorDate: Wed Oct 4 12:37:20 2023 -0700 IMPALA-12485: Remove Python 2 has_key Switch calls to dict#has_key (Python 2-only) for 'key in dict' syntax. Change-Id: I08e9f6667011d70ceddbf919a61d1be7d6e07ee4 Reviewed-on: http://gerrit.cloudera.org:8080/20541 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- common/thrift/generate_metrics.py | 2 +- tests/common/test_vector.py | 2 +- tests/query_test/test_cancellation.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/thrift/generate_metrics.py b/common/thrift/generate_metrics.py index c261213b2..6aa02822f 100755 --- a/common/thrift/generate_metrics.py +++ b/common/thrift/generate_metrics.py @@ -231,7 +231,7 @@ def generate_mdl(): mdl['version'] = options.output_mdl_version for role in mdl['roles']: role_metrics = [] - if metrics_by_role.has_key(role['name']): + if role['name'] in metrics_by_role: role_metrics = metrics_by_role[role['name']] role['metricDefinitions'] = role_metrics diff --git a/tests/common/test_vector.py b/tests/common/test_vector.py index d1b37bb59..182d962fe 100644 --- a/tests/common/test_vector.py +++ b/tests/common/test_vector.py @@ -119,7 +119,7 @@ class ImpalaTestMatrix(object): del self.dimensions[dimension_name] def has_dimension(self, dimension_name): - return self.dimensions.has_key(dimension_name) + return dimension_name in self.dimensions def generate_test_vectors(self, exploration_strategy): if not self.dimensions: diff --git a/tests/query_test/test_cancellation.py b/tests/query_test/test_cancellation.py index 5a5f504ce..e4b718b47 100644 --- a/tests/query_test/test_cancellation.py +++ b/tests/query_test/test_cancellation.py @@ -142,7 +142,7 @@ class TestCancellation(ImpalaTestSuite): self.cleanup_test_table(vector.get_value('table_format')) file_format = vector.get_value('table_format').file_format if file_format == 'kudu': - assert QUERIES.has_key(query) and QUERIES[query] is not None,\ + assert query in QUERIES and QUERIES[query] is not None,\ "PRIMARY KEY for query %s not specified" % query query = "create table ctas_cancel primary key (%s) "\ "partition by hash partitions 3 stored as kudu as %s" %\
