-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Add `auto` interval to histogram AggConfig Closes: #75438 * fix JEST * update UI * add tests * some changes * small changes * cleanup code * fix PR comment * fix PR comments * fix PR comment * Update src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts Co-authored-by: Wylie Conlon <wylieconlon@gmail.com> * Change algorithm for auto interval * Update src/plugins/data/common/search/aggs/buckets/histogram.ts Co-authored-by: Luke Elmers <lukeelmers@gmail.com> * added some comments * Update src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts Co-authored-by: Wylie Conlon <wylieconlon@gmail.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Wylie Conlon <wylieconlon@gmail.com> Co-authored-by: Luke Elmers <lukeelmers@gmail.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Wylie Conlon <wylieconlon@gmail.com> Co-authored-by: Luke Elmers <lukeelmers@gmail.com>
- Loading branch information
4 people
authored
Sep 2, 2020
1 parent
35b7e11
commit defb31d
Showing
17 changed files
with
553 additions
and
76 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
144 changes: 144 additions & 0 deletions
144
src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts
This file contains 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,144 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { | ||
| calculateHistogramInterval, | ||
| CalculateHistogramIntervalParams, | ||
| } from './histogram_calculate_interval'; | ||
|
|
||
| describe('calculateHistogramInterval', () => { | ||
| describe('auto calculating mode', () => { | ||
| let params: CalculateHistogramIntervalParams; | ||
|
|
||
| beforeEach(() => { | ||
| params = { | ||
| interval: 'auto', | ||
| intervalBase: undefined, | ||
| maxBucketsUiSettings: 100, | ||
| maxBucketsUserInput: undefined, | ||
| values: { | ||
| min: 0, | ||
| max: 1, | ||
| }, | ||
| }; | ||
| }); | ||
|
|
||
| describe('maxBucketsUserInput is defined', () => { | ||
| test('should not set interval which more than largest possible', () => { | ||
| const p = { | ||
| ...params, | ||
| maxBucketsUserInput: 200, | ||
| values: { | ||
| min: 150, | ||
| max: 250, | ||
| }, | ||
| }; | ||
| expect(calculateHistogramInterval(p)).toEqual(1); | ||
| }); | ||
|
|
||
| test('should correctly work for float numbers (small numbers)', () => { | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| maxBucketsUserInput: 50, | ||
| values: { | ||
| min: 0.1, | ||
| max: 0.9, | ||
| }, | ||
| }) | ||
| ).toBe(0.02); | ||
| }); | ||
|
|
||
| test('should correctly work for float numbers (big numbers)', () => { | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| maxBucketsUserInput: 10, | ||
| values: { | ||
| min: 10.45, | ||
| max: 1000.05, | ||
| }, | ||
| }) | ||
| ).toBe(100); | ||
| }); | ||
| }); | ||
|
|
||
| describe('maxBucketsUserInput is not defined', () => { | ||
| test('should not set interval which more than largest possible', () => { | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| values: { | ||
| min: 0, | ||
| max: 100, | ||
| }, | ||
| }) | ||
| ).toEqual(1); | ||
| }); | ||
|
|
||
| test('should set intervals for integer numbers (diff less than maxBucketsUiSettings)', () => { | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| values: { | ||
| min: 1, | ||
| max: 10, | ||
| }, | ||
| }) | ||
| ).toEqual(0.1); | ||
| }); | ||
|
|
||
| test('should set intervals for integer numbers (diff more than maxBucketsUiSettings)', () => { | ||
| // diff === 44445; interval === 500; buckets === 89 | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| values: { | ||
| min: 45678, | ||
| max: 90123, | ||
| }, | ||
| }) | ||
| ).toEqual(500); | ||
| }); | ||
|
|
||
| test('should set intervals the same for the same interval', () => { | ||
| // both diffs are the same | ||
| // diff === 1.655; interval === 0.02; buckets === 82 | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| values: { | ||
| min: 1.245, | ||
| max: 2.9, | ||
| }, | ||
| }) | ||
| ).toEqual(0.02); | ||
| expect( | ||
| calculateHistogramInterval({ | ||
| ...params, | ||
| values: { | ||
| min: 0.5, | ||
| max: 2.3, | ||
| }, | ||
| }) | ||
| ).toEqual(0.02); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.