Pārlūkot izejas kodu

HUE-8610 [tb] Include compute in stats and describe table calls from the table browser

Johan Ahlen 7 gadi atpakaļ
vecāks
revīzija
653e808853

+ 0 - 1
apps/beeswax/src/beeswax/urls.py

@@ -83,7 +83,6 @@ urlpatterns += [
   url(r'^api/query/clear_history/?$', beeswax_api.clear_history, name='clear_history'),
 
   url(r'^api/table/(?P<database>\w+)/(?P<table>\w+)/?$', beeswax_api.describe_table, name='describe_table'),
-  url(r'^api/table/(?P<database>\w+)/(?P<table>\w+)/(?P<cluster>.+)$', beeswax_api.describe_table, name='describe_table'),
   url(r'^api/table/(?P<database>\w+)/(?P<table>\w+)/indexes/?$', beeswax_api.get_indexes, name='get_indexes'),
   url(r'^api/table/(?P<database>\w+)/(?P<table>\w+)/sample/?$', beeswax_api.get_sample_data, name='get_sample_data'),
   url(r'^api/table/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)/sample/?$', beeswax_api.get_sample_data, name='get_sample_data_column'),

+ 2 - 1
apps/metastore/src/metastore/views.py

@@ -158,9 +158,10 @@ def alter_database(request, database):
   return JsonResponse(response)
 
 
-def get_database_metadata(request, database, cluster=None):
+def get_database_metadata(request, database):
   response = {'status': -1, 'data': ''}
   source_type = request.POST.get('source_type', 'hive')
+  cluster = {'id': request.GET.get('cluster', 'default')}
   db = _get_db(user=request.user, source_type=source_type, cluster=cluster)
 
   try:

+ 1 - 0
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -1419,6 +1419,7 @@ var ApiHelper = (function () {
 
     var params = {
       'format' : 'json'
+      //'source_type': options.sourceType // TODO: Blows up server-side with 'impala'
     };
 
     if (options.compute && options.compute.id) {