Pārlūkot izejas kodu

HUE-8737 [core] Fix collision with new keywork async in Python 3.7

Ying Chen 6 gadi atpakaļ
vecāks
revīzija
4eb89cd849

+ 3 - 3
apps/beeswax/src/beeswax/api.py

@@ -664,18 +664,18 @@ def get_sample_data(request, database, table, column=None):
   return JsonResponse(response)
 
 
-def _get_sample_data(db, database, table, column, async=False, cluster=None, operation=None):
+def _get_sample_data(db, database, table, column, is_async=False, cluster=None, operation=None):
   table_obj = db.get_table(database, table)
   if table_obj.is_impala_only and db.client.query_server['server_name'] != 'impala':
     query_server = get_query_server_config('impala', connector=cluster)
     db = dbms.get(db.client.user, query_server, cluster=cluster)
 
-  sample_data = db.get_sample(database, table_obj, column, generate_sql_only=async, operation=operation)
+  sample_data = db.get_sample(database, table_obj, column, generate_sql_only=is_async, operation=operation)
   response = {'status': -1}
 
   if sample_data:
     response['status'] = 0
-    if async:
+    if is_async:
       notebook = make_notebook(
           name=_('Table sample for `%(database)s`.`%(table)s`.`%(column)s`') % {'database': database, 'table': table, 'column': column},
           editor_type=_get_servername(db),

+ 2 - 2
desktop/libs/notebook/src/notebook/api.py

@@ -710,10 +710,10 @@ def get_sample_data(request, server=None, database=None, table=None, column=None
   # Passed by check_document_access_permission but unused by APIs
   notebook = json.loads(request.POST.get('notebook', '{}'))
   snippet = json.loads(request.POST.get('snippet', '{}'))
-  async = json.loads(request.POST.get('async', 'false'))
+  is_async = json.loads(request.POST.get('async', 'false'))
   operation = json.loads(request.POST.get('operation', '"default"'))
 
-  sample_data = get_api(request, snippet).get_sample_data(snippet, database, table, column, async=async, operation=operation)
+  sample_data = get_api(request, snippet).get_sample_data(snippet, database, table, column, is_async=is_async, operation=operation)
   response.update(sample_data)
 
   response['status'] = 0

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -469,7 +469,7 @@ class Api(object):
   def get_jobs(self, notebook, snippet, logs):
     return []
 
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None): raise NotImplementedError()
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None): raise NotImplementedError()
 
   def export_data_as_hdfs_file(self, snippet, target_file, overwrite): raise NotImplementedError()
 

+ 2 - 2
desktop/libs/notebook/src/notebook/connectors/hive_metastore.py

@@ -70,9 +70,9 @@ class HiveMetastoreApi(Api):
 
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     return []
 
 
-  def _get_db(self, snippet, async=False, cluster=None):
+  def _get_db(self, snippet, is_async=False, cluster=None):
     return dbms.get(self.user, query_server=get_query_server_config(name='hms', cluster=cluster))

+ 5 - 5
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -496,10 +496,10 @@ class HS2Api(Api):
 
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     try:
-      db = self._get_db(snippet, async, interpreter=self.interpreter)
-      return _get_sample_data(db, database, table, column, async, operation=operation, cluster=self.interpreter)
+      db = self._get_db(snippet, is_async=is_async, interpreter=self.interpreter)
+      return _get_sample_data(db, database, table, column, is_async, operation=operation, cluster=self.interpreter)
     except QueryServerException as ex:
       raise QueryError(ex.message)
 
@@ -732,8 +732,8 @@ DROP TABLE IF EXISTS `%(table)s`;
     return HiveServerQueryHandle(**handle)
 
 
-  def _get_db(self, snippet, async=False, interpreter=None):
-    if not async and snippet['type'] == 'hive':
+  def _get_db(self, snippet, is_async=False, interpreter=None):
+    if not is_async and snippet['type'] == 'hive':
       name = 'beeswax'
     elif snippet['type'] == 'hive':
       name = 'hive'

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/jdbc.py

@@ -152,7 +152,7 @@ class JdbcApi(Api):
     return response
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     if self.db is None:
       raise AuthenticationRequired()
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/rdbms.py

@@ -142,7 +142,7 @@ class RdbmsApi(Api):
 
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     query_server = self._get_query_server()
     db = dbms.get(self.user, query_server)
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/solr.py

@@ -155,7 +155,7 @@ class SolrApi(Api):
 
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     from search.conf import SOLR_URL
     db = NativeSolrApi(SOLR_URL.get(), self.user)
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/sql_alchemy.py

@@ -289,7 +289,7 @@ class SqlAlchemyApi(Api):
 
 
   @query_error_handler
-  def get_sample_data(self, snippet, database=None, table=None, column=None, async=False, operation=None):
+  def get_sample_data(self, snippet, database=None, table=None, column=None, is_async=False, operation=None):
     engine = self._create_engine()
     inspector = inspect(engine)