Skip to content

Make sure that IdFieldType#isAggregatable is accurate. #62903

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
Oct 5, 2020
Merged

Make sure that IdFieldType#isAggregatable is accurate. #62903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdb4f8b
Make sure that IdFieldType#isAggregatable is accurate.
jtibshirani Sep 24, 2020
24a878b
Merge remote-tracking branch 'upstream/master' into pr
jtibshirani Oct 5, 2020
045a9bc
Fix leftover changes from merge.
jtibshirani Oct 5, 2020
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
2 changes: 2 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public void testEnableFieldData() throws IOException {
throw new UnsupportedOperationException();
}).build(null, null));
assertThat(exc.getMessage(), containsString(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey()));
assertFalse(ft.isAggregatable());

client().admin().cluster().prepareUpdateSettings()
.setTransientSettings(Settings.builder().put(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey(), true))
Expand All @@ -97,6 +98,7 @@ public void testEnableFieldData() throws IOException {
throw new UnsupportedOperationException();
}).build(null, null);
assertWarnings(ID_FIELD_DATA_DEPRECATION_MESSAGE);
assertTrue(ft.isAggregatable());
} finally {
// unset cluster setting
client().admin().cluster().prepareUpdateSettings()
Expand Down
8 changes: 8 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,12 @@ public void testTermsQuery() {
Query query = ft.termQuery("id", context);
assertEquals(new TermInSetQuery("_id", Uid.encodeId("id")), query);
}

public void testIsAggregatable() {
MappedFieldType ft = new IdFieldMapper.IdFieldType(() -> false);
assertFalse(ft.isAggregatable());

ft = new IdFieldMapper.IdFieldType(() -> true);
assertTrue(ft.isAggregatable());
}
}