瀏覽代碼

HUE-8613 [tb] Send cluster when dropping databases from the table browser

Johan Ahlen 7 年之前
父節點
當前提交
ab4fb35160
共有 2 個文件被更改,包括 10 次插入2 次删除
  1. 6 2
      apps/metastore/src/metastore/templates/metastore.mako
  2. 4 0
      apps/metastore/src/metastore/views.py

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

@@ -356,6 +356,10 @@ ${ 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"/>
+            <!-- ko with: catalogEntry -->
+            <input type="hidden" name="namespace" data-bind="value: namespace.id"/>
+            <input type="hidden" name="cluster" data-bind="value: JSON.stringify(compute)"/>
+            <!-- /ko -->
         % else:
           <form id="dropDatabaseForm" action="/metastore/databases/drop" method="POST">
         % endif
@@ -367,7 +371,7 @@ ${ components.menubar(is_embeddable) }
             <div class="modal-body">
               <ul data-bind="foreach: selectedDatabases">
                 <li>
-                  <span data-bind="text: catalogEntry.name"></span>
+                  <span data-bind="text: catalogEntry().name"></span>
                 </li>
               </ul>
             </div>
@@ -377,7 +381,7 @@ ${ components.menubar(is_embeddable) }
               <input type="submit" class="btn btn-danger" value="${_('Yes')}"/>
             </div>
             <!-- ko foreach: selectedDatabases -->
-            <input type="hidden" name="database_selection" data-bind="value: catalogEntry.name" />
+            <input type="hidden" name="database_selection" data-bind="value: catalogEntry().name" />
             <!-- /ko -->
           </form>
         </div>

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

@@ -104,6 +104,8 @@ def drop_database(request):
       if request.POST.get('is_embeddable'):
         design = SavedQuery.create_empty(app_name=source_type if source_type != 'hive' else 'beeswax', owner=request.user, data=hql_query('').dumps())
         last_executed = json.loads(request.POST.get('start_time'), '-1')
+        cluster = json.loads(request.POST.get('cluster', '{}'))
+        namespace = request.POST.get('namespace')
         sql = db.drop_databases(databases, design, generate_ddl_only=True)
         job = make_notebook(
             name=_('Drop database %s') % ', '.join(databases)[:100],
@@ -111,6 +113,8 @@ def drop_database(request):
             statement=sql.strip(),
             status='ready',
             database=None,
+            namespace=namespace,
+            compute=cluster,
             on_success_url='assist.db.refresh',
             is_task=True,
             last_executed=last_executed