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

Query splitting: add key to merged response (#78522)

Browse Source 
* Query splitting: add key to response

* Query splitting: use queryGroupId as key

* Add unit test
This commit is contained in:
Matias Chomicki 2023-11-30 13:27:44 +01:00 committed by GitHub
parent f26ad881ed
commit 24082d61c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/loki/querySplitting.test.ts
View File

@ -12,6 +12,9 @@ import { trackGroupedQueries } from './tracking';
import { LokiQuery, LokiQueryType } from './types'; import { LokiQuery, LokiQueryType } from './types';
jest.mock('./tracking'); jest.mock('./tracking');
jest.mock('uuid', () => ({
v4: jest.fn().mockReturnValue('uuid'),
}));
describe('runSplitQuery()', () => { describe('runSplitQuery()', () => {
let datasource: LokiDatasource; let datasource: LokiDatasource;
@ -39,6 +42,14 @@ describe('runSplitQuery()', () => {
}); });
}); });
test('Returns a DataQueryResponse with the expected attributes', async () => {
await expect(runSplitQuery(datasource, request)).toEmitValuesWith((response) => {
expect(response[0].data).toBeDefined();
expect(response[0].state).toBe(LoadingState.Done);
expect(response[0].key).toBeDefined();
});
});
test('Correctly splits queries without step', async () => { test('Correctly splits queries without step', async () => {
await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => { await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
expect(datasource.runQuery).toHaveBeenNthCalledWith( expect(datasource.runQuery).toHaveBeenNthCalledWith(
@ -201,6 +212,7 @@ describe('runSplitQuery()', () => {
{ {
data: [], data: [],
state: LoadingState.Done, state: LoadingState.Done,
key: 'uuid',
}, },
[ [
{ {
@ -233,6 +245,7 @@ describe('runSplitQuery()', () => {
{ {
data: [], data: [],
state: LoadingState.Done, state: LoadingState.Done,
key: 'uuid',
}, },
[ [
{ {

3
public/app/plugins/datasource/loki/querySplitting.ts
View File

@ -76,7 +76,8 @@ function adjustTargetsFromResponseState(targets: LokiQuery[], response: DataQuer
.filter((target) => target.maxLines === undefined || target.maxLines > 0); .filter((target) => target.maxLines === undefined || target.maxLines > 0);
} }
export function runSplitGroupedQueries(datasource: LokiDatasource, requests: LokiGroupedRequest[]) { export function runSplitGroupedQueries(datasource: LokiDatasource, requests: LokiGroupedRequest[]) {
let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Streaming }; const responseKey = requests.length ? requests[0].request.queryGroupId : uuidv4();
let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Streaming, key: responseKey };
const totalRequests = Math.max(...requests.map(({ partition }) => partition.length)); const totalRequests = Math.max(...requests.map(({ partition }) => partition.length));
const longestPartition = requests.filter(({ partition }) => partition.length === totalRequests)[0].partition; const longestPartition = requests.filter(({ partition }) => partition.length === totalRequests)[0].partition;