Browse Source

HUE-8572 [tb] Add compute and namespace to DROP table endpoint

Johan Ahlen 7 years ago
parent
commit
af30c70a2d

+ 2 - 0
apps/metastore/src/metastore/templates/metastore.mako

@@ -543,6 +543,8 @@ ${ components.menubar(is_embeddable) }
         <input type="hidden" name="is_embeddable" value="true"/>
         <input type="hidden" name="start_time" value=""/>
         <input type="hidden" name="source_type" data-bind="value: $root.source().type"/>
+        <input type="hidden" name="namespace" data-bind="value: catalogEntry.namespace.id"/>
+        <input type="hidden" name="compute" data-bind="value: catalogEntry.compute.id"/>
     % else:
       <form data-bind="attr: { 'action': '/metastore/tables/drop/' +catalogEntry. name }" method="POST">
     % endif

+ 4 - 0
apps/metastore/src/metastore/views.py

@@ -404,6 +404,8 @@ def drop_table(request, database):
       tables = request.POST.getlist('table_selection')
       tables_objects = [db.get_table(database, table) for table in tables]
       skip_trash = request.POST.get('skip_trash') == 'on'
+      compute = request.POST.get('compute')
+      namespace = request.POST.get('namespace')
 
       if request.POST.get('is_embeddable'):
         last_executed = json.loads(request.POST.get('start_time'), '-1')
@@ -414,6 +416,8 @@ def drop_table(request, database):
             statement=sql.strip(),
             status='ready',
             database=database,
+            namespace=namespace,
+            compute=compute,
             on_success_url='assist.db.refresh',
             is_task=True,
             last_executed=last_executed

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

@@ -58,7 +58,8 @@ def escape_rows(rows, nulls_only=False, encoding=None):
 
 def make_notebook(name='Browse', description='', editor_type='hive', statement='', status='ready',
                   files=None, functions=None, settings=None, is_saved=False, database='default', snippet_properties=None, batch_submit=False,
-                  on_success_url=None, skip_historify=False, is_task=False, last_executed=-1, is_notebook=False, pub_sub_url=None, result_properties={}):
+                  on_success_url=None, skip_historify=False, is_task=False, last_executed=-1, is_notebook=False, pub_sub_url=None, result_properties={},
+                  namespace='default', compute='default'):
   '''
   skip_historify: do not add the task to the query history. e.g. SQL Dashboard
   isManaged: true when being a managed by Hue operation (include_managed=True in document), e.g. exporting query result, dropping some tables
@@ -123,6 +124,12 @@ def make_notebook(name='Browse', description='', editor_type='hive', statement='
          },
          'name': name,
          'database': database,
+         'namespace': {
+            'id': namespace
+         },
+         'compute': {
+            'id': compute
+         },
          'result': {'handle':{}},
          'variables': []
       }