IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Use merge transform instead of DataFrame -> Table -> Merge -> toDataFrame (#25694)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-06-22 15:30:16 +02:00 committed by GitHub
parent eb734a2f6e
commit 95d53f03a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
public/app/features/explore/utils/ResultProcessor.ts
View File

@ -4,13 +4,12 @@ import {
DataFrame, DataFrame,
FieldType, FieldType,
TimeZone, TimeZone,
toDataFrame,
getDisplayProcessor, getDisplayProcessor,
ExploreMode, ExploreMode,
PreferredVisualisationType, PreferredVisualisationType,
standardTransformers,
} from '@grafana/data'; } from '@grafana/data';
import { ExploreItemState } from 'app/types/explore'; import { ExploreItemState } from 'app/types/explore';
import TableModel, { mergeTablesIntoModel, MutableColumn } from 'app/core/table_model';
import { sortLogsResult, refreshIntervalToSortOrder } from 'app/core/utils/explore'; import { sortLogsResult, refreshIntervalToSortOrder } from 'app/core/utils/explore';
import { dataFrameToLogsModel } from 'app/core/logs_model'; import { dataFrameToLogsModel } from 'app/core/logs_model';
import { getGraphSeriesModel } from 'app/plugins/panel/graph2/getGraphSeriesModel'; import { getGraphSeriesModel } from 'app/plugins/panel/graph2/getGraphSeriesModel';
@ -69,36 +68,8 @@ export class ResultProcessor {
return null; return null;
} }
const tables = onlyTables.map(frame => { const mergeTransformer = standardTransformers.mergeTransformer.transformer({});
const { fields } = frame; const data = mergeTransformer(onlyTables)[0];
const fieldCount = fields.length;
const rowCount = frame.length;
const columns: MutableColumn[] = fields.map(field => ({
text: field.name,
type: field.type,
filterable: field.config.filterable,
custom: field.config.custom,
}));
const rows: any[][] = [];
for (let i = 0; i < rowCount; i++) {
const row: any[] = [];
for (let j = 0; j < fieldCount; j++) {
row.push(frame.fields[j].values.get(i));
}
rows.push(row);
}
return new TableModel({
columns,
rows,
meta: frame.meta,
});
});
const mergedTable = mergeTablesIntoModel(new TableModel(), ...tables);
const data = toDataFrame(mergedTable);
// set display processor // set display processor
for (const field of data.fields) { for (const field of data.fields) {