瀏覽代碼

HUE-3450 [metastore] Only sort by popularity whehn enrich is turned on

Romain Rigaux 9 年之前
父節點
當前提交
c387547

+ 14 - 10
apps/metastore/src/metastore/static/metastore/js/metastore.ko.js

@@ -65,18 +65,21 @@
         });
       }
       return returned.sort(function (a, b) {
-        if (typeof a.optimizerStats() !== 'undefined' && a.optimizerStats() !== null) {
-          if (typeof b.optimizerStats() !== 'undefined' && b.optimizerStats() !== null) {
-            if (a.optimizerStats().popularity === b.optimizerStats().popularity) {
-              return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+    	if (options.optimizerEnabled()) {
+          if (typeof a.optimizerStats() !== 'undefined' && a.optimizerStats() !== null) {
+            if (typeof b.optimizerStats() !== 'undefined' && b.optimizerStats() !== null) {
+              if (a.optimizerStats().popularity === b.optimizerStats().popularity) {
+                return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+              }
+              return  b.optimizerStats().popularity - a.optimizerStats().popularity;
             }
-            return  b.optimizerStats().popularity - a.optimizerStats().popularity;
+            return -1
+          }
+          if (typeof b.optimizerStats() !== 'undefined' && b.optimizerStats() !== null) {
+            return 1;
           }
-          return -1
-        }
-        if (typeof b.optimizerStats() !== 'undefined' && b.optimizerStats() !== null) {
-          return 1;
         }
+
         return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
       });
     });
@@ -678,7 +681,8 @@
             return new MetastoreDatabase({
               name: name,
               assistHelper: self.assistHelper,
-              i18n: self.i18n
+              i18n: self.i18n,
+              optimizerEnabled: self.optimizerEnabled
             })
           }));
           self.loading(false);

+ 1 - 0
desktop/libs/metadata/src/metadata/optimizer_api.py

@@ -106,6 +106,7 @@ def table_details(request):
   if data['status'] == 'success':
     response['status'] = 0
     response['details'] = data['details']
+    print [c['columnName'] for c in data['details']['sortedTotal']]
   else:
     response['message'] = 'Optimizer: %s' % data['details']