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

HeatmapNG: pre-allocate arrays during calc (#51465)

Browse Source
This commit is contained in:
Leon Sorokin 2022-06-27 18:43:59 -05:00 committed by GitHub
parent cfbfacb152
commit 89b150ab58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.betterer.results
View File

@ -7072,10 +7072,10 @@ exports[`better eslint`] = {
"public/app/features/transformers/calculateHeatmap/editor/helper.ts:2898656130": [ "public/app/features/transformers/calculateHeatmap/editor/helper.ts:2898656130": [
[10, 37, 3, "Unexpected any. Specify a different type.", "193409811"] [10, 37, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/features/transformers/calculateHeatmap/heatmap.ts:2895010613": [ "public/app/features/transformers/calculateHeatmap/heatmap.ts:992367420": [
[65, 9, 52, "Do not use any type assertions.", "3480700880"], [65, 9, 52, "Do not use any type assertions.", "3480700880"],
[306, 63, 29, "Do not use any type assertions.", "255738422"], [321, 63, 29, "Do not use any type assertions.", "255738422"],
[306, 89, 3, "Unexpected any. Specify a different type.", "193409811"] [321, 89, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx:1060905279": [ "public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx:1060905279": [
[44, 29, 21, "Do not use any type assertions.", "1548027068"] [44, 29, 21, "Do not use any type assertions.", "1548027068"]

25
public/app/features/transformers/calculateHeatmap/heatmap.ts
View File

@ -244,9 +244,6 @@ export function prepBucketFrames(frames: DataFrame[]): DataFrame[] {
export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCalculationOptions): DataFrame { export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCalculationOptions): DataFrame {
//console.time('calculateHeatmapFromData'); //console.time('calculateHeatmapFromData');
let xs: number[] = [];
let ys: number[] = [];
// optimization // optimization
//let xMin = Infinity; //let xMin = Infinity;
//let xMax = -Infinity; //let xMax = -Infinity;
@ -254,6 +251,20 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
let xField: Field | undefined = undefined; let xField: Field | undefined = undefined;
let yField: Field | undefined = undefined; let yField: Field | undefined = undefined;
let dataLen = 0;
// pre-allocate arrays
for (let frame of frames) {
// TODO: assumes numeric timestamps, ordered asc, without nulls
const x = frame.fields.find((f) => f.type === FieldType.time);
if (x) {
dataLen += frame.length;
}
}
let xs: number[] = Array(dataLen);
let ys: number[] = Array(dataLen);
let j = 0;
for (let frame of frames) { for (let frame of frames) {
// TODO: assumes numeric timestamps, ordered asc, without nulls // TODO: assumes numeric timestamps, ordered asc, without nulls
const x = frame.fields.find((f) => f.type === FieldType.time); const x = frame.fields.find((f) => f.type === FieldType.time);
@ -268,8 +279,12 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
const xValues = x.values.toArray(); const xValues = x.values.toArray();
for (let field of frame.fields) { for (let field of frame.fields) {
if (field !== x && field.type === FieldType.number) { if (field !== x && field.type === FieldType.number) {
xs = xs.concat(xValues); const yValues = field.values.toArray();
ys = ys.concat(field.values.toArray());
for (let i = 0; i < xValues.length; i++, j++) {
xs[j] = xValues[i];
ys[j] = yValues[i];
}
if (!yField) { if (!yField) {
yField = field; yField = field;