Skip to content

Fix request with disabled aggregation #85696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 21, 2020
Merged

Fix request with disabled aggregation #85696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
477081b
Fix request with disabled aggregation
Dec 11, 2020
f96a8d4
Merge branch 'master' into fix/disabled_agg_error
kibanamachine Dec 14, 2020
daf9376
Update unit tests
Dec 14, 2020
3facd94
Merge branch 'master' into fix/disabled_agg_error
kibanamachine Dec 15, 2020
770cd66
Merge branch 'master' into fix/disabled_agg_error
kibanamachine Dec 16, 2020
73241d4
Merge branch 'master' into fix/disabled_agg_error
kibanamachine Dec 18, 2020
ecd42aa
Merge branch 'master' into fix/disabled_agg_error
kibanamachine Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ describe('esaggs expression function - public', () => {
});
});

test('calls agg.postFlightRequest if it exiests', async () => {
test('calls agg.postFlightRequest if it exiests and agg is enabled', async () => {
mockParams.aggs.aggs[0].enabled = true;
await handleRequest(mockParams);
expect(mockParams.aggs.aggs[0].type.postFlightRequest).toHaveBeenCalledTimes(1);

Expand All @@ -160,6 +161,12 @@ describe('esaggs expression function - public', () => {
expect(async () => await handleRequest(mockParams)).not.toThrowError();
});

test('should skip agg.postFlightRequest call if the agg is disabled', async () => {
mockParams.aggs.aggs[0].enabled = false;
await handleRequest(mockParams);
expect(mockParams.aggs.aggs[0].type.postFlightRequest).toHaveBeenCalledTimes(0);
});

test('tabifies response data', async () => {
await handleRequest(mockParams);
expect(tabifyAggResponse).toHaveBeenCalledWith(
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/common/search/expressions/esaggs/request_handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const handleRequest = async ({
// response data incorrectly in the inspector.
let response = (searchSource as any).rawResponse;
for (const agg of aggs.aggs) {
if (typeof agg.type.postFlightRequest === 'function') {
if (agg.enabled && typeof agg.type.postFlightRequest === 'function') {
response = await agg.type.postFlightRequest(
response,
aggs,
Expand Down