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

Jump to bottom

SQL: cover the Integer type when extracting values from _source #42859

Merged
merged 5 commits into from Jun 10, 2019
Merged

SQL: cover the Integer type when extracting values from _source #42859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abcde7c
Cover the integer values when extracting field values from _source
astefan Jun 4, 2019
7b43e90
Merge branch 'master' of https://github.com/elastic/elasticsearch int…
astefan Jun 4, 2019
55a04c0
Take into consideration a wider range of Numbers when extracting the
astefan Jun 6, 2019
0820868
Merge branch 'master' of https://github.com/elastic/elasticsearch int…
astefan Jun 6, 2019
fb48e30
Remove unused imports
astefan Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...c/main/java/org/elasticsearch/xpack/sql/execution/search/extractor/FieldHitExtractor.java
View file
Open in desktop
Expand Up @@ -165,7 +165,11 @@ private Object unwrapMultiValue(Object values) {
return DateUtils.asDateTime(Long.parseLong(values.toString()), zoneId);
}
}
if (values instanceof Long || values instanceof Double || values instanceof String || values instanceof Boolean) {
if (values instanceof Integer
|| values instanceof Long
|| values instanceof Double
|| values instanceof String
|| values instanceof Boolean) {
return values;
}
throw new SqlIllegalArgumentException("Type {} (returned by [{}]) is not supported", values.getClass().getSimpleName(), fieldName);
Expand Down
4 changes: 3 additions & 1 deletion ...t/java/org/elasticsearch/xpack/sql/execution/search/extractor/FieldHitExtractorTests.java
View file
Open in desktop
Expand Up @@ -580,6 +580,7 @@ private Object randomValue() {
() -> randomAlphaOfLength(10),
ESTestCase::randomLong,
ESTestCase::randomDouble,
ESTestCase::randomInt,
() -> null));
return value.get();
}
Expand All @@ -588,7 +589,8 @@ private Object randomNonNullValue() {
Supplier<Object> value = randomFrom(Arrays.asList(
() -> randomAlphaOfLength(10),
ESTestCase::randomLong,
ESTestCase::randomDouble));
ESTestCase::randomDouble,
ESTestCase::randomInt));
return value.get();
}

Expand Down