Skip to content

Fix scaled_float numeric type in aggregations #22351

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

Merged
merged 3 commits into from
Dec 27, 2016
Merged

Fix scaled_float numeric type in aggregations #22351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5ca018
Fix scaled_float numeric type in aggregations
jimczi Dec 26, 2016
17d2710
cosmetic
jimczi Dec 26, 2016
d720d13
ScaledFloat fielddata type should be DOUBLE and not FLOAT
jimczi Dec 27, 2016
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
5 changes: 4 additions & 1 deletion core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,10 @@ public Index index() {

@Override
public NumericType getNumericType() {
return scaledFieldData.getNumericType();
/**
* {@link ScaledFloatLeafFieldData#getDoubleValues()} transforms the raw long values in `scaled` floats.
*/
return NumericType.FLOAT;
Copy link
Contributor

@jpountz jpountz Dec 26, 2016

Choose a reason for hiding this comment

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

I don't think that will change anything in practice, but I think the correct value would be DOUBLE?

}

}
Expand Down
1 change: 1 addition & 0 deletions core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public void testFieldData() throws IOException {
// single-valued
ft.setName("scaled_float1");
IndexNumericFieldData fielddata = (IndexNumericFieldData) ft.fielddataBuilder().build(indexSettings, ft, null, null, null);
assertEquals(fielddata.getNumericType(), IndexNumericFieldData.NumericType.FLOAT);
AtomicNumericFieldData leafFieldData = fielddata.load(reader.leaves().get(0));
SortedNumericDoubleValues values = leafFieldData.getDoubleValues();
values.setDocument(0);
Expand Down
49 changes: 49 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ setup:
type: long
double:
type: double
scaled_float:
type: scaled_float
scaling_factor: 100
date:
type: date

Expand Down Expand Up @@ -282,6 +285,52 @@ setup:

- match: { aggregations.double_terms.buckets.1.doc_count: 1 }

---
"Scaled float test":
- do:
index:
index: test_1
type: test
id: 1
body: { "scaled_float": 9.99 }

- do:
index:
index: test_1
type: test
id: 2
body: { "scaled_float": 9.994 }

- do:
index:
index: test_1
type: test
id: 3
body: { "scaled_float": 8.99 }

- do:
indices.refresh: {}

- do:
search:
body: { "size" : 0, "aggs" : { "scaled_float_terms" : { "terms" : { "field" : "scaled_float" } } } }

- match: { hits.total: 3 }

- length: { aggregations.scaled_float_terms.buckets: 2 }

- match: { aggregations.scaled_float_terms.buckets.0.key: 9.99 }

- is_false: aggregations.scaled_float_terms.buckets.0.key_as_string

- match: { aggregations.scaled_float_terms.buckets.0.doc_count: 2 }

- match: { aggregations.scaled_float_terms.buckets.1.key: 8.99 }

- is_false: aggregations.scaled_float_terms.buckets.1.key_as_string

- match: { aggregations.scaled_float_terms.buckets.1.doc_count: 1 }

---
"Date test":
- do:
Expand Down