IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-13 09:32:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

ReduceTransform: Include series with numeric string names (#31763)

Browse Source 
* ReduceTransform: Include series with numeric string  names

* Chore: updates after PR comments
This commit is contained in:
Hugo Häggmark 2021-03-09 06:02:38 +01:00 committed by GitHub
parent 0a13d10071
commit bc5ea345e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 104 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
packages/grafana-data/src/transformations/transformers/reduce.test.ts
View File

@ -274,4 +274,96 @@ describe('Reducer Transformer', () => {
}
`);
});
it('reduces multiple data frames with decimal display name (https://github.com/grafana/grafana/issues/31580)', async () => {
const cfg = {
id: DataTransformerID.reduce,
options: {
reducers: [ReducerID.max],
},
};
const seriesA = toDataFrame({
name: 'a',
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: 'value', type: FieldType.number, values: [3, 4, 5, 6], state: { displayName: 'a' } },
],
});
const seriesB = toDataFrame({
name: '2021',
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: 'value', type: FieldType.number, values: [7, 8, 9, 10], state: { displayName: '2021' } },
],
});
await expect(transformDataFrame([cfg], [seriesA, seriesB])).toEmitValuesWith((received) => {
const processed = received[0];
const expected: Field[] = [
{
name: 'Field',
type: FieldType.string,
values: new ArrayVector(['a', '2021']),
config: {},
},
{
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6, 10]),
config: {},
},
];
expect(processed.length).toEqual(1);
expect(processed[0].length).toEqual(2);
expect(processed[0].fields).toEqual(expected);
});
});
it('reduces multiple data frames with decimal fields name (https://github.com/grafana/grafana/issues/31580)', async () => {
const cfg = {
id: DataTransformerID.reduce,
options: {
reducers: [ReducerID.max],
},
};
const seriesA = toDataFrame({
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: 'a', type: FieldType.number, values: [3, 4, 5, 6] },
],
});
const seriesB = toDataFrame({
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: '2021', type: FieldType.number, values: [7, 8, 9, 10] },
],
});
await expect(transformDataFrame([cfg], [seriesA, seriesB])).toEmitValuesWith((received) => {
const processed = received[0];
const expected: Field[] = [
{
name: 'Field',
type: FieldType.string,
values: new ArrayVector(['a', '2021']),
config: {},
},
{
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6, 10]),
config: {},
},
];
expect(processed.length).toEqual(1);
expect(processed[0].length).toEqual(2);
expect(processed[0].fields).toEqual(expected);
});
});
});

21
packages/grafana-data/src/transformations/transformers/reduce.ts
View File

@ -1,7 +1,7 @@
import { map } from 'rxjs/operators';
import { DataTransformerID } from './ids';
import { DataTransformerInfo, MatcherConfig, FieldMatcher } from '../../types/transformations';
import { DataTransformerInfo, FieldMatcher, MatcherConfig } from '../../types/transformations';
import { fieldReducers, reduceField, ReducerID } from '../fieldReducer';
import { alwaysFieldMatcher, notTimeFieldMatcher } from '../matchers/predicates';
import { DataFrame, Field, FieldType } from '../../types/dataFrame';
@ -149,15 +149,18 @@ export function mergeResults(data: DataFrame[]): DataFrame | undefined {
for (let seriesIndex = 1; seriesIndex < data.length; seriesIndex++) {
const series = data[seriesIndex];
for (const baseField of baseFrame.fields) {
for (const field of series.fields) {
if (baseField.type !== field.type || baseField.name !== field.name) {
continue;
}
for (let baseIndex = 0; baseIndex < baseFrame.fields.length; baseIndex++) {
const baseField = baseFrame.fields[baseIndex];
for (let fieldIndex = 0; fieldIndex < series.fields.length; fieldIndex++) {
const field = series.fields[fieldIndex];
const isFirstField = baseIndex === 0 && fieldIndex === 0;
const isSameField = baseField.type === field.type && baseField.name === field.name;
const baseValues: any[] = ((baseField.values as unknown) as ArrayVector).buffer;
const values: any[] = ((field.values as unknown) as ArrayVector).buffer;
((baseField.values as unknown) as ArrayVector).buffer = baseValues.concat(values);
if (isFirstField || isSameField) {
const baseValues: any[] = baseField.values.toArray();
const values: any[] = field.values.toArray();
((baseField.values as unknown) as ArrayVector).buffer = baseValues.concat(values);
}
}
}
}