فهرست منبع

HUE-218 [beeswax] Add mechanism to kill a Hive query

Works with Yarn.
Also fix query cancelling that was using the wrong id
Romain Rigaux 12 سال پیش
والد
کامیت
7e3431ae37
2فایلهای تغییر یافته به همراه2 افزوده شده و 5 حذف شده
  1. 1 4
      apps/beeswax/src/beeswax/templates/execute.mako
  2. 1 1
      apps/beeswax/static/js/beeswax.vm.js

+ 1 - 4
apps/beeswax/src/beeswax/templates/execute.mako

@@ -241,12 +241,9 @@ ${layout.menubar(section='query')}
           <textarea class="hide" tabindex="1" name="query" id="queryField"></textarea>
 
           <div class="actions">
-            % if app_name == 'impala':
             <button data-bind="click: tryExecuteQuery, visible: $root.canExecute, enable: $root.queryEditorBlank" type="button" id="executeQuery" class="btn btn-primary disable-feedback" tabindex="2">${_('Execute')}</button>
             <button data-bind="click: tryCancelQuery, visible: $root.design.isRunning()" class="btn btn-danger" data-loading-text="${ _('Canceling...') }" rel="tooltip" data-original-title="${ _('Cancel the query') }">${ _('Cancel') }</button>
-            % else:
-            <button data-bind="click: tryExecuteQuery, enable: $root.canExecute() && $root.queryEditorBlank()" type="button" id="executeQuery" class="btn btn-primary disable-feedback" tabindex="2">${_('Execute')}</button>
-            % endif
+
             <button data-bind="click: executeNextStatement, visible: !$root.design.isFinished()" type="button" class="btn btn-primary disable-feedback" tabindex="2">${_('Next')}</button>
 
             <button data-bind="click: trySaveDesign, css: {'hide': !$root.design.id() || $root.design.id() == -1}" type="button" class="btn hide">${_('Save')}</button>

+ 1 - 1
apps/beeswax/static/js/beeswax.vm.js

@@ -694,7 +694,7 @@ function BeeswaxViewModel(server) {
 
   self.cancelQuery = function() {
     $(document).trigger('cancel.query');
-    var url = '/' + self.server() + '/api/query/' + self.design.id() + '/cancel';
+    var url = '/' + self.server() + '/api/query/' + self.design.history.id() + '/cancel';
     $.post(url,
       function(response) {
         if (response['status'] != 0) {