فهرست منبع

HUE-7420 [jb] queries are not in sorted order

jdesjean 8 سال پیش
والد
کامیت
fa858e5

+ 3 - 3
apps/jobbrowser/src/jobbrowser/apis/query_api.py

@@ -54,7 +54,7 @@ class QueryApi(Api):
     jobs_iter_filtered = self._n_filter(filter_list, jobs_iter)
 
     return {
-      'apps': [{
+      'apps': sorted([{
         'id': job['query_id'],
         'name': job['stmt'][:100] + ('...' if len(job['stmt']) > 100 else ''),
         'status': job['state'],
@@ -70,8 +70,8 @@ class QueryApi(Api):
         'rows_fetched': job['rows_fetched'],
         'waiting': job['waiting'],
         'waiting_time': job['waiting_time']
-      } for job in jobs_iter_filtered],
-      'total': len(jobs['in_flight_queries']) + len(jobs['completed_queries'])
+      } for job in jobs_iter_filtered], key=lambda job: job.get('submitted'), reverse=True),
+      'total': jobs['num_in_flight_queries'] + jobs['num_executing_queries'] + jobs['num_waiting_queries']
     }
 
   def _time_in_ms_groups(self, groups):

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

@@ -2294,7 +2294,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
             while ((self.apps().length == 0 || i < self.apps().length) && j < data.apps.length) { // Nothing displayed or compare existing
               if (self.apps().length == 0 || self.apps()[i].id() != data.apps[j].id) {
                 // New Job
-                newJobs.push(new Job(vm, data.apps[j]));
+                newJobs.unshift(new Job(vm, data.apps[j]));
                 j++;
               } else {
                 // Updated jobs