Просмотр исходного кода

fix: fixed slow down issue in table panel by removing the fillter null values feature (#7602), not sure the filter null values is a good table option, should be done in metric query, fixes #8234

Torkel Ödegaard 8 лет назад
Родитель
Сommit
e218052a90

+ 0 - 4
public/app/plugins/panel/table/editor.html

@@ -21,10 +21,6 @@
 				<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
 				<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
 			</div>
 			</div>
 		</div>
 		</div>
-    <gf-form-switch class="gf-form" label-class="width-10"
-                    label="Filter null values"
-                    checked="editor.panel.filterNull"
-                    on-change="editor.render()"></gf-form-switch>
 	</div>
 	</div>
 
 
 	<div class="section gf-form-group">
 	<div class="section gf-form-group">

+ 0 - 1
public/app/plugins/panel/table/module.ts

@@ -45,7 +45,6 @@ class TablePanelCtrl extends MetricsPanelCtrl {
     scroll: true,
     scroll: true,
     fontSize: '100%',
     fontSize: '100%',
     sort: {col: 0, desc: true},
     sort: {col: 0, desc: true},
-    filterNull: false,
   };
   };
 
 
   /** @ngInject */
   /** @ngInject */

+ 2 - 10
public/app/plugins/panel/table/transformers.ts

@@ -220,8 +220,7 @@ transformers['json'] = {
 };
 };
 
 
 function transformDataToTable(data, panel) {
 function transformDataToTable(data, panel) {
-  var model = new TableModel(),
-    copyData = angular.copy(data);
+  var model = new TableModel();
 
 
   if (!data || data.length === 0) {
   if (!data || data.length === 0) {
     return model;
     return model;
@@ -232,14 +231,7 @@ function transformDataToTable(data, panel) {
     throw {message: 'Transformer ' + panel.transform + ' not found'};
     throw {message: 'Transformer ' + panel.transform + ' not found'};
   }
   }
 
 
-  if (panel.filterNull) {
-    for (var i = 0; i < copyData.length; i++) {
-      copyData[i].datapoints = copyData[i].datapoints.filter((dp) => dp[0] != null);
-    }
-  }
-
-  transformer.transform(copyData, panel, model);
-
+  transformer.transform(data, panel, model);
   return model;
   return model;
 }
 }