Skip to content
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

Fix issue with long values in TSVB static metric #40256

Merged
merged 5 commits into from
Jul 5, 2019
Merged

Fix issue with long values in TSVB static metric #40256

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf38f1c
Fix issue with long values in TSVB static metric
Jul 3, 2019
4489a7a
Handle numeric values with decimal zeros
Jul 3, 2019
a8b3cb4
Work properly with exponential values
Jul 5, 2019
ac2028b
Wrap into boolean
Jul 5, 2019
9db6b55
Merge branch 'master' of github.com:elastic/kibana into fix-tsvb-stat…
timroes Jul 5, 2019
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
4 changes: 3 additions & 1 deletion src/legacy/core_plugins/metrics/server/lib/vis_data/helpers/bucket_transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ export const bucketTransform = {
},
static: bucket => {
checkMetric(bucket, ['value']);
// Anything containing a decimal point or an exponent is considered decimal value
const isDecimalValue = bucket.value.match(/[.e]/i);
Copy link
Contributor

@alexwizp alexwizp Jul 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
But probably it make sense to wrap it Boolean(bucket.value.match(/[.e]/i)) . In case of false isDecimalValue === undefined

image

Also this solution works only if bucket.value has string value. I still think that we can create a helper method for that because the following code can confuse
Boolean(Number(bucket.value).toString().match(/[.e]/i))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as we're inside JS I think checking for null as a falsey value is fine, but I can wrap it. I cannot convert it to a number, because of the issue you pointed out that it will actually create the 64 bit rounding issues for the check, but then when we later write the script the string value won't have those, so Number('1231123112631231233.123').toString() == "1231123112631231200" meaning we will append a L and then Elasticsearch will fail because it's not a valid long.

return {
bucket_script: {
buckets_path: { count: '_count' },
script: {
source: bucket.value,
source: isDecimalValue ? bucket.value : `${bucket.value}L`,
lang: 'painless',
},
gap_policy: 'skip',
Expand Down
30 changes: 30 additions & 0 deletions src/legacy/core_plugins/metrics/server/lib/vis_data/helpers/bucket_transform.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,35 @@ describe('src/legacy/core_plugins/metrics/server/lib/vis_data/helpers/bucket_tra
expect(bucketTransform.moving_average(bucket, metrics)).toMatchSnapshot();
});
});

describe('static', () => {
test('should return a script with a double value when using decimals', () => {
expect(bucketTransform.static({ value: '421.12' })).toHaveProperty(
'bucket_script.script.source',
'421.12'
);
});

test('should return a long script for integer values', () => {
expect(bucketTransform.static({ value: '1234567890123' })).toHaveProperty(
'bucket_script.script.source',
'1234567890123L'
);
});

test('should not return a long script for exponential values', () => {
expect(bucketTransform.static({ value: '123123123e12' })).toHaveProperty(
'bucket_script.script.source',
'123123123e12'
);
});

test('should return decimal scripts for very large decimals', () => {
expect(bucketTransform.static({ value: '1234178312312381273123123.11123' })).toHaveProperty(
'bucket_script.script.source',
'1234178312312381273123123.11123'
);
});
});
});
});