IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Transformations: Fix null for reduceSeriesToRows (#90508)

Browse Source 
* Transformations: Fix null for reduceSeriesToRows

* Add tests with null data frames
This commit is contained in:
Drew Slobodnjak 2024-07-17 09:25:46 -07:00 committed by GitHub
parent bc2cdd82dc
commit 1fc57d8fd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,14 @@ const seriesAWithMultipleFields = toDataFrame({
],
});
const seriesAWithAllNulls = toDataFrame({
name: 'A',
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: 'temperature', type: FieldType.number, values: [null, null, null, null, null] },
],
});
const seriesBWithSingleField = toDataFrame({
name: 'B',
fields: [
@ -44,6 +52,14 @@ const seriesBWithMultipleFields = toDataFrame({
],
});
const seriesBWithAllNulls = toDataFrame({
name: 'B',
fields: [
{ name: 'time', type: FieldType.time, values: [3000, 4000, 5000, 6000] },
{ name: 'temperature', type: FieldType.number, values: [null, null, null, null, null] },
],
});
describe('Reducer Transformer', () => {
beforeAll(() => {
mockTransformationsRegistry([reduceTransformer]);
@ -177,6 +193,99 @@ describe('Reducer Transformer', () => {
);
});
it('reduces multiple data frames, one having all null values', async () => {
const cfg = {
id: DataTransformerID.reduce,
options: {
reducers: [ReducerID.first, ReducerID.min, ReducerID.max, ReducerID.last],
},
};
await expect(transformDataFrame([cfg], [seriesAWithAllNulls, seriesBWithSingleField])).toEmitValuesWith(
(received) => {
const processed = received[0];
const expected: Field[] = [
{
name: 'Field',
type: FieldType.string,
values: ['A temperature', 'B temperature'],
config: {},
},
{
name: 'First',
type: FieldType.number,
values: [NaN, 1],
config: {},
},
{
name: 'Min',
type: FieldType.number,
values: [NaN, 1],
config: {},
},
{
name: 'Max',
type: FieldType.number,
values: [NaN, 7],
config: {},
},
{
name: 'Last',
type: FieldType.number,
values: [NaN, 7],
config: {},
},
];
expect(processed.length).toEqual(1);
expect(processed[0].length).toEqual(2);
expect(processed[0].fields).toEqual(expected);
}
);
await expect(transformDataFrame([cfg], [seriesAWithSingleField, seriesBWithAllNulls])).toEmitValuesWith(
(received) => {
const processed = received[0];
const expected: Field[] = [
{
name: 'Field',
type: FieldType.string,
values: ['A temperature', 'B temperature'],
config: {},
},
{
name: 'First',
type: FieldType.number,
values: [3, NaN],
config: {},
},
{
name: 'Min',
type: FieldType.number,
values: [3, NaN],
config: {},
},
{
name: 'Max',
type: FieldType.number,
values: [6, NaN],
config: {},
},
{
name: 'Last',
type: FieldType.number,
values: [6, NaN],
config: {},
},
];
expect(processed.length).toEqual(1);
expect(processed[0].length).toEqual(2);
expect(processed[0].fields).toEqual(expected);
}
);
});
it('reduces single data frame with many fields', async () => {
const cfg = {
id: DataTransformerID.reduce,

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

@ -132,7 +132,12 @@ function reduceSeriesToRows(
for (const info of calculators) {
const v = results[info.id];
calcs[info.id][i] = v;
if (v === null) {
// NaN ensures proper row index, null results in shift
calcs[info.id][i] = NaN;
} else {
calcs[info.id][i] = v;
}
}
}