honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid precision loss in DocValueFormat.RAW#parseLong (#49063) (#49169)

This commit is contained in:
Mark Tozzi 2019-11-15 12:32:26 -05:00 committed by GitHub
parent aa4d86c5e9
commit dad68c59fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/search/DocValueFormat.java
View File

@ -117,6 +117,12 @@ public interface DocValueFormat extends NamedWriteable {
@Override @Override
public long parseLong(String value, boolean roundUp, LongSupplier now) { public long parseLong(String value, boolean roundUp, LongSupplier now) {
try {
// Prefer parsing as a long to avoid losing precision
return Long.parseLong(value);
} catch (NumberFormatException e) {
// retry as a double
}
double d = Double.parseDouble(value); double d = Double.parseDouble(value);
if (roundUp) { if (roundUp) {
d = Math.ceil(d); d = Math.ceil(d);

5
server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java
View File

@ -168,6 +168,7 @@ public class DocValueFormatTests extends ESTestCase {
public void testRawParse() { public void testRawParse() {
assertEquals(-1L, DocValueFormat.RAW.parseLong("-1", randomBoolean(), null)); assertEquals(-1L, DocValueFormat.RAW.parseLong("-1", randomBoolean(), null));
assertEquals(1L, DocValueFormat.RAW.parseLong("1", randomBoolean(), null)); assertEquals(1L, DocValueFormat.RAW.parseLong("1", randomBoolean(), null));
assertEquals(Long.MAX_VALUE - 2, DocValueFormat.RAW.parseLong(Long.toString(Long.MAX_VALUE - 2), randomBoolean(), null));
// not checking exception messages as they could depend on the JVM // not checking exception messages as they could depend on the JVM
expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("", randomBoolean(), null)); expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("", randomBoolean(), null));
expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("abc", randomBoolean(), null)); expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("abc", randomBoolean(), null));
@ -176,8 +177,8 @@ public class DocValueFormatTests extends ESTestCase {
assertEquals(1d, DocValueFormat.RAW.parseDouble("1", randomBoolean(), null), 0d); assertEquals(1d, DocValueFormat.RAW.parseDouble("1", randomBoolean(), null), 0d);
assertEquals(.5, DocValueFormat.RAW.parseDouble("0.5", randomBoolean(), null), 0d); assertEquals(.5, DocValueFormat.RAW.parseDouble("0.5", randomBoolean(), null), 0d);
// not checking exception messages as they could depend on the JVM // not checking exception messages as they could depend on the JVM
expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("", randomBoolean(), null)); expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseDouble("", randomBoolean(), null));
expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseLong("abc", randomBoolean(), null)); expectThrows(IllegalArgumentException.class, () -> DocValueFormat.RAW.parseDouble("abc", randomBoolean(), null));
assertEquals(new BytesRef("abc"), DocValueFormat.RAW.parseBytesRef("abc")); assertEquals(new BytesRef("abc"), DocValueFormat.RAW.parseBytesRef("abc"));
} }