Эх сурвалжийг харах

HUE-7420 [jb] Fix impala summary & plan whitespace + perf

jdesjean 8 жил өмнө
parent
commit
49a6cd9

+ 4 - 1
apps/jobbrowser/src/jobbrowser/apis/query_api.py

@@ -183,7 +183,10 @@ class QueryApi(Api):
     return self.api.get_query_memory(query_id=appid);
 
   def _query(self, appid):
-    return self.api.get_query(query_id=appid)
+    query = self.api.get_query(query_id=appid)
+    query['summary'] = query.get('summary').strip()
+    query['plan'] = query.get('plan').strip()
+    return query
 
   def _query_profile(self, appid):
     return self.api.get_query_profile(query_id=appid)

+ 3 - 3
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -899,7 +899,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
       <ul class="nav nav-pills margin-top-20">
         <li>
-          <a href="#queries-page-plan${ SUFFIX }" data-bind="click: function(){ $('a[href=\'#queries-page-plan${ SUFFIX }\']').tab('show'); }, event: {'shown': function () { fetchProfile('plan'); } }">
+          <a href="#queries-page-plan${ SUFFIX }" data-bind="click: function(){ $('a[href=\'#queries-page-plan${ SUFFIX }\']').tab('show'); }, event: {'shown': function () { if (!properties.plan || !properties.plan().plan) { fetchProfile('plan'); } } }">
             ${ _('Plan') }</a>
         </li>
         <li>
@@ -915,11 +915,11 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
             ${ _('Summary') }</a>
         </li>
         <li>
-          <a href="#queries-page-profile${ SUFFIX }" data-bind="click: function(){ fetchProfile('profile'); $('a[href=\'#queries-page-profile${ SUFFIX }\']').tab('show'); }">
+          <a href="#queries-page-profile${ SUFFIX }" data-bind="click: function(){ if (!properties.profile || !properties.profile().profile) { fetchProfile('profile'); } $('a[href=\'#queries-page-profile${ SUFFIX }\']').tab('show'); }">
             ${ _('Profile') }</a>
         </li>
         <li>
-          <a href="#queries-page-memory${ SUFFIX }" data-bind="click: function(){ fetchProfile('memory'); $('a[href=\'#queries-page-memory${ SUFFIX }\']').tab('show'); }">
+          <a href="#queries-page-memory${ SUFFIX }" data-bind="click: function(){ if (!properties.memory || !properties.memory().mem_usage) { fetchProfile('memory'); } $('a[href=\'#queries-page-memory${ SUFFIX }\']').tab('show'); }">
             ${ _('Memory') }</a>
         </li>
       </ul>