honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix string terms get key as number to see integers

Browse Source 
Currently this method parses the string as a double. This means that it
might lose accuracy if the value is a long that is greater than
2^52. This commit changes this method to try to detect whether the
string represents a long first.
This commit is contained in:
Antonio Matarrese 2018-01-26 11:22:42 +00:00 committed by Jason Tedor
parent e59f14d139
commit f61591c6ec
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java
View File

@ -64,10 +64,18 @@ public class StringTerms extends InternalMappedTerms<StringTerms, StringTerms.Bu
return getKeyAsString();
}
// this method is needed for scripted numeric aggs
@Override
public Number getKeyAsNumber() {
// this method is needed for scripted numeric aggs
return Double.parseDouble(termBytes.utf8ToString());
/*
* If the term is a long greater than 2^52 then parsing as a double would lose accuracy. Therefore, we first parse as a long and
* if this fails then we attempt to parse the term as a double.
*/
try {
return Long.parseLong(termBytes.utf8ToString());
} catch (final NumberFormatException ignored) {
return Double.parseDouble(termBytes.utf8ToString());
}
}
@Override

2
server/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java
View File

@ -70,6 +70,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.IsNull.notNullValue;
@ESIntegTestCase.SuiteScopeTestCase
@ -313,6 +314,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase {
assertThat(terms.getName(), equalTo("terms"));
for (Bucket bucket : terms.getBuckets()) {
assertTrue(foundTerms.add(bucket.getKeyAsNumber()));
assertThat(bucket.getKeyAsNumber(), instanceOf(Double.class));
}
}
assertEquals(expectedCardinality, foundTerms.size());

2
server/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java
View File

@ -67,6 +67,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.IsNull.notNullValue;
@ESIntegTestCase.SuiteScopeTestCase
@ -431,6 +432,7 @@ public class LongTermsIT extends AbstractTermsTestCase {
assertThat(bucket, notNullValue());
assertThat(key(bucket), equalTo("" + i));
assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
assertThat(bucket.getKeyAsNumber(), instanceOf(Long.class));
assertThat(bucket.getDocCount(), equalTo(1L));
}
}