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

Make sure that IdFieldType#isAggregatable is accurate. (#62903) 

Before, it always returned 'true' even when the setting
"indices.id_field_data.enabled" was false.

Fixes #62897.
This commit is contained in:
Julie Tibshirani 2020-10-05 10:48:04 -07:00
parent 2405162c39
commit 733e89d7ed
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java
View File

@ -87,6 +87,7 @@ public class IdFieldMapperTests extends ESSingleNodeTestCase {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
}).build(null, null); }).build(null, null);
assertWarnings(ID_FIELD_DATA_DEPRECATION_MESSAGE); assertWarnings(ID_FIELD_DATA_DEPRECATION_MESSAGE);
assertTrue(ft.isAggregatable());
client().admin().cluster().prepareUpdateSettings() client().admin().cluster().prepareUpdateSettings()
.setTransientSettings(Settings.builder().put(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey(), false)) .setTransientSettings(Settings.builder().put(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey(), false))
@ -97,6 +98,7 @@ public class IdFieldMapperTests extends ESSingleNodeTestCase {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
}).build(null, null)); }).build(null, null));
assertThat(exc.getMessage(), containsString(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey())); assertThat(exc.getMessage(), containsString(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey()));
assertFalse(ft.isAggregatable());
} finally { } finally {
// unset cluster setting // unset cluster setting
client().admin().cluster().prepareUpdateSettings() client().admin().cluster().prepareUpdateSettings()

8
server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java
View File

@ -67,4 +67,12 @@ public class IdFieldTypeTests extends ESTestCase {
query = ft.termQuery("id", context); query = ft.termQuery("id", context);
assertEquals(new TermInSetQuery("_id", Uid.encodeId("id")), query); 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());
}
} }