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

loki: query splitting: stricter types (#63387)

Browse Source
This commit is contained in:
Gábor Farkas 2023-02-17 19:43:08 +01:00 committed by GitHub
parent bf494be633
commit 7a8f1ab566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/plugins/datasource/loki/queryUtils.ts
View File

@ -1,7 +1,14 @@
import { SyntaxNode } from '@lezer/common';
import { escapeRegExp } from 'lodash';
import { ArrayVector, DataQueryResponse, DataQueryResponseData, Field, QueryResultMetaStat } from '@grafana/data';
import {
ArrayVector,
DataFrame,
DataQueryResponse,
DataQueryResponseData,
Field,
QueryResultMetaStat,
} from '@grafana/data';
import {
parser,
LineFilter,
@ -330,7 +337,7 @@ export function combineResponses(currentResult: DataQueryResponse | null, newRes
return currentResult;
}
function combineFrames(dest: DataQueryResponseData, source: DataQueryResponseData) {
function combineFrames(dest: DataFrame, source: DataFrame) {
const totalFields = dest.fields.length;
for (let i = 0; i < totalFields; i++) {
dest.fields[i].values = new ArrayVector(
@ -341,7 +348,7 @@ function combineFrames(dest: DataQueryResponseData, source: DataQueryResponseDat
combineMetadata(dest, source);
}
function combineMetadata(dest: DataQueryResponseData = {}, source: DataQueryResponseData = {}) {
function combineMetadata(dest: DataFrame, source: DataFrame) {
if (!source.meta?.stats) {
return;
}
@ -353,7 +360,7 @@ function combineMetadata(dest: DataQueryResponseData = {}, source: DataQueryResp
return;
}
dest.meta.stats.forEach((destStat: QueryResultMetaStat, i: number) => {
const sourceStat = source.meta.stats?.find(
const sourceStat = source.meta?.stats?.find(
(sourceStat: QueryResultMetaStat) => destStat.displayName === sourceStat.displayName
);
if (sourceStat) {