Skip to content

Commit 8d3b25f

Browse files
jordan-powersncordon
authored andcommitted
Re-enable doc value skippers on host.name (elastic#138310)
This PR removes the feature flag from the check to enable doc value skippers on host.name. This PR is a follow-up to elastic#138252 to bring the fixes into main.
1 parent b10e537 commit 8d3b25f

File tree

2 files changed

+11
-31
lines changed

2 files changed

+11
-31
lines changed

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ private boolean shouldUseTimeSeriesSkipper() {
462462

463463
private boolean shouldUseHostnameSkipper(final String fullFieldName) {
464464
return hasDocValues.get()
465-
&& indexSettings.useDocValuesSkipper()
465+
&& IndexSettings.USE_DOC_VALUES_SKIPPER.get(indexSettings.getSettings())
466466
&& indexSettings.getIndexVersionCreated().onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
467467
&& IndexMode.LOGSDB.equals(indexSettings.getMode())
468468
&& HOST_NAME.equals(fullFieldName)

server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -968,12 +968,8 @@ public void testFieldTypeWithSkipDocValues_LogsDbMode() throws IOException {
968968
}));
969969

970970
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
971-
if (mapperService.getIndexSettings().useDocValuesSkipper()) {
972-
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
973-
} else {
974-
assertFalse(mapper.fieldType().indexType().hasDocValuesSkipper());
975-
assertTrue(mapper.fieldType().indexType().hasTerms());
976-
}
971+
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
972+
assertFalse(mapper.fieldType().indexType().hasTerms());
977973
}
978974

979975
public void testFieldTypeDefault_StandardMode() throws IOException {
@@ -1024,12 +1020,8 @@ public void testFieldTypeDefault_ConfiguredIndexedWithSettingOverride() throws I
10241020

10251021
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
10261022
assertTrue(mapper.fieldType().hasDocValues());
1027-
if (mapperService.getIndexSettings().useDocValuesSkipper()) {
1028-
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1029-
} else {
1030-
assertFalse(mapper.fieldType().indexType().hasDocValuesSkipper());
1031-
assertTrue(mapper.fieldType().indexType().hasTerms());
1032-
}
1023+
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1024+
assertFalse(mapper.fieldType().indexType().hasTerms());
10331025
}
10341026

10351027
public void testFieldTypeDefault_ConfiguredIndexedWithoutSettingOverride() throws IOException {
@@ -1046,12 +1038,8 @@ public void testFieldTypeDefault_ConfiguredIndexedWithoutSettingOverride() throw
10461038

10471039
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
10481040
assertTrue(mapper.fieldType().hasDocValues());
1049-
if (mapperService.getIndexSettings().useDocValuesSkipper()) {
1050-
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1051-
} else {
1052-
assertFalse(mapper.fieldType().indexType().hasDocValuesSkipper());
1053-
assertTrue(mapper.fieldType().indexType().hasTerms());
1054-
}
1041+
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1042+
assertFalse(mapper.fieldType().indexType().hasTerms());
10551043
}
10561044

10571045
public void testFieldTypeDefault_ConfiguredDocValues() throws IOException {
@@ -1068,12 +1056,8 @@ public void testFieldTypeDefault_ConfiguredDocValues() throws IOException {
10681056

10691057
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
10701058
assertTrue(mapper.fieldType().hasDocValues());
1071-
if (mapperService.getIndexSettings().useDocValuesSkipper()) {
1072-
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1073-
} else {
1074-
assertFalse(mapper.fieldType().indexType().hasDocValuesSkipper());
1075-
assertTrue(mapper.fieldType().indexType().hasTerms());
1076-
}
1059+
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1060+
assertFalse(mapper.fieldType().indexType().hasTerms());
10771061
}
10781062

10791063
public void testFieldTypeDefault_LogsDbMode_NonSortField() throws IOException {
@@ -1108,12 +1092,8 @@ public void testFieldTypeWithSkipDocValues_IndexedFalseDocValuesTrue() throws IO
11081092

11091093
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
11101094
assertTrue(mapper.fieldType().hasDocValues());
1111-
if (mapperService.getIndexSettings().useDocValuesSkipper()) {
1112-
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1113-
} else {
1114-
assertFalse(mapper.fieldType().indexType().hasDocValuesSkipper());
1115-
assertTrue(mapper.fieldType().indexType().hasOnlyDocValues());
1116-
}
1095+
assertTrue(mapper.fieldType().indexType().hasDocValuesSkipper());
1096+
assertFalse(mapper.fieldType().indexType().hasTerms());
11171097
}
11181098

11191099
public void testFieldTypeDefault_IndexedFalseDocValuesFalse() throws IOException {

0 commit comments

Comments
 (0)