Просмотр исходного кода

HUE-8758 [connectors] Remove compute name combined to snippet type

Romain 6 лет назад
Родитель
Сommit
03b8758e9d

+ 0 - 4
apps/impala/src/impala/dbms.py

@@ -58,10 +58,6 @@ def get_query_server_config():
   return query_server
 
 
-def _get_server_name(cluster_config):
-  return 'impala' + ('-' + cluster_config.get('name') if cluster_config and cluster_config.get('name') != CLUSTER_ID.get() else '')
-
-
 class ImpalaDbms(HiveServer2Dbms):
 
   @classmethod

+ 5 - 3
apps/jobbrowser/src/jobbrowser/apis/query_api.py

@@ -34,8 +34,8 @@ LOG = logging.getLogger(__name__)
 
 try:
   from beeswax.models import Session
-  from impala.server import get_api as get_impalad_api, _get_impala_server_url
   from impala.dbms import _get_server_name
+  from impala.server import get_api as get_impalad_api, _get_impala_server_url
 except Exception as e:
   LOG.exception('Some application are not enabled: %s' % e)
 
@@ -44,7 +44,9 @@ def _get_api(user, cluster=None):
   if cluster and cluster.get('type') == 'altus-dw':
     server_url = 'http://impala-coordinator-%(name)s:25000' % cluster
   else:
-    session = Session.objects.get_session(user, application=_get_server_name(cluster))
+    # TODO: multi computes if snippet.get('compute') or snippet['type'] has computes
+    application = cluster.get('type', 'impala')
+    session = Session.objects.get_session(user, application=application)
     server_url = _get_impala_server_url(session)
   return get_impalad_api(user=user, url=server_url)
 
@@ -308,4 +310,4 @@ class QueryApi(Api):
   def _n_filter(self, filters, tuples):
     for f in filters:
       tuples = list(filter(f, tuples))
-    return tuples
+    return tuples

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

@@ -328,7 +328,6 @@ def get_api(request, snippet):
     snippet['type'] = 'impala'
 
   interpreter = get_interpreter(connector_type=snippet['type'], user=request.user)
-
   interface = interpreter['interface']
 
   # TODO: clean computes

+ 2 - 4
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -58,7 +58,6 @@ except ImportError, e:
 
 try:
   from impala import api   # Force checking if Impala is enabled
-  from impala.dbms import _get_server_name
   from impala.conf import CONFIG_WHITELIST as impala_settings
   from impala.server import get_api as get_impalad_api, ImpalaDaemonApiException, _get_impala_server_url
 except ImportError, e:
@@ -68,6 +67,7 @@ except ImportError, e:
 try:
   from jobbrowser.views import get_job
   from jobbrowser.conf import ENABLE_QUERY_BROWSER
+  from jobbrowser.apis.query_api import _get_api
   has_query_browser = ENABLE_QUERY_BROWSER.get()
 except (AttributeError, ImportError), e:
   LOG.warn("Job Browser app is not enabled")
@@ -768,10 +768,8 @@ DROP TABLE IF EXISTS `%(table)s`;
     total_records, total_size, msg = None, None, None
 
     query_id = self._get_impala_query_id(snippet)
-    application = _get_server_name(snippet.get('compute', {}))
-    session = Session.objects.get_session(self.user, application=application)
+    server_url = _get_api(self.user, snippet)._url
 
-    server_url = _get_impala_server_url(session)
     if query_id:
       LOG.debug("Attempting to get Impala query profile at server_url %s for query ID: %s" % (server_url, query_id))
 

+ 0 - 1
desktop/libs/notebook/src/notebook/models.py

@@ -78,7 +78,6 @@ def make_notebook(
   '''
   from notebook.connectors.hiveserver2 import HS2Api
 
-  # impala can have compute name appended to the editor_type (impala/dbms.py - get_query_server_config) # TODO: remove
   if has_connectors():
     interpreter = get_interpreter(connector_type=editor_type)
     editor_connector = editor_type