-
Notifications
You must be signed in to change notification settings - Fork 8.4k
[Aggs] Force return 0 on empty buckets on count if null flag is disabled #207308
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.
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
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ef67968
:bug: Return 0 on empty buckets if null flag is disabled
dej611 a85cdc5
:bug: Improve fix
dej611 a87d8bb
:white_check_mark: Add unit tests
dej611 37d3001
Merge branch 'main' into fix/206555
dej611 51546d5
Merge branch 'main' into fix/206555
dej611 a5f7fd5
Update src/platform/plugins/shared/data/common/search/aggs/metrics/co…
dej611 1176882
Merge branch 'main' into fix/206555
dej611 e66661d
Update src/platform/plugins/shared/data/common/search/aggs/metrics/co…
dej611 8994c12
:recycle: Restore old code
dej611 35a47f1
Merge branch 'main' into fix/206555
dej611 69a7d58
Merge branch 'main' into fix/206555
dej611 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
87 changes: 87 additions & 0 deletions
87
src/platform/plugins/shared/data/common/search/aggs/metrics/count.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the "Elastic License | ||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
* Public License v 1"; you may not use this file except in compliance with, at | ||
* your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
* License v3.0 only", or the "Server Side Public License, v 1". | ||
*/ | ||
|
||
import moment from 'moment'; | ||
import { IMetricAggConfig } from './metric_agg_type'; | ||
import { getCountMetricAgg } from './count'; | ||
|
||
function makeAgg(emptyAsNull: boolean = false, timeShift?: moment.Duration): IMetricAggConfig { | ||
return { | ||
getTimeShift() { | ||
return timeShift; | ||
}, | ||
params: { | ||
emptyAsNull, | ||
}, | ||
} as IMetricAggConfig; | ||
} | ||
|
||
function getBucket(value: number | undefined, timeShift?: moment.Duration) { | ||
const suffix = timeShift ? `_${timeShift.asMilliseconds()}` : ''; | ||
return { ['doc_count' + suffix]: value }; | ||
} | ||
|
||
describe('Count', () => { | ||
it('should return the value for a non-shifted bucket', () => { | ||
const agg = getCountMetricAgg(); | ||
expect(agg.getValue(makeAgg(), getBucket(1000))).toBe(1000); | ||
}); | ||
|
||
it('should return the value for a shifted bucket', () => { | ||
const agg = getCountMetricAgg(); | ||
const shift = moment.duration(1800000); | ||
expect(agg.getValue(makeAgg(false, shift), getBucket(1000, shift))).toBe(1000); | ||
}); | ||
|
||
describe('emptyAsNull', () => { | ||
it('should return null if the value is 0 and the flag is enabled', () => { | ||
const agg = getCountMetricAgg(); | ||
expect(agg.getValue(makeAgg(true), getBucket(0))).toBe(null); | ||
}); | ||
|
||
it('should return null if the value is undefined and the flag is enabled', () => { | ||
const agg = getCountMetricAgg(); | ||
expect(agg.getValue(makeAgg(true), getBucket(undefined))).toBe(null); | ||
}); | ||
|
||
it('should return null if the value is 0 and the flag is enabled on a shifted count', () => { | ||
const agg = getCountMetricAgg(); | ||
const shift = moment.duration(1800000); | ||
expect(agg.getValue(makeAgg(true, shift), getBucket(0, shift))).toBe(null); | ||
}); | ||
|
||
it('should return null if the value is undefined and the flag is enabled on a shifted count', () => { | ||
const agg = getCountMetricAgg(); | ||
const shift = moment.duration(1800000); | ||
expect(agg.getValue(makeAgg(true, shift), getBucket(undefined, shift))).toBe(null); | ||
}); | ||
|
||
it('should return 0 if the value is 0 and the flag is disabled', () => { | ||
const agg = getCountMetricAgg(); | ||
expect(agg.getValue(makeAgg(false), getBucket(0))).toBe(0); | ||
}); | ||
|
||
it('should return 0 if the value is undefined and the flag is disabled', () => { | ||
const agg = getCountMetricAgg(); | ||
expect(agg.getValue(makeAgg(false), getBucket(undefined))).toBe(0); | ||
}); | ||
|
||
it('should return 0 if the value is 0 and the flag is disabled on a shifted count', () => { | ||
const agg = getCountMetricAgg(); | ||
const shift = moment.duration(1800000); | ||
expect(agg.getValue(makeAgg(false, shift), getBucket(undefined, shift))).toBe(0); | ||
}); | ||
|
||
it('should return 0 if the value is undefined and the flag is disabled on a shifted count', () => { | ||
const agg = getCountMetricAgg(); | ||
const shift = moment.duration(1800000); | ||
expect(agg.getValue(makeAgg(false, shift), getBucket(undefined, shift))).toBe(0); | ||
}); | ||
}); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.