From ba1ba595640e45f01877b9ca576b57702be4614f Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Mon, 10 Nov 2025 16:53:06 +0000 Subject: [PATCH] Fix KeywordFieldMapperTests in non-snapshot build runs KeywordFieldMapperTests was checking Settings directly for the presence of the USE_DOCVALUES_SKIPPERS flag, rather than going via IndexSettings.useDocValuesSkipper(), which meant that for non-snapshot builds the FeatureFlag was not being taken into account. --- .../index/mapper/KeywordFieldMapperTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java index 641ddeb170f77..e2b3de2672654 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java @@ -982,7 +982,7 @@ public void testFieldTypeWithSkipDocValues_LogsDbMode() throws IOException { })); final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name"); - if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { + if (mapperService.getIndexSettings().useDocValuesSkipper()) { assertTrue(mapper.fieldType().hasDocValuesSkipper()); } else { assertFalse(mapper.fieldType().hasDocValuesSkipper()); @@ -1038,7 +1038,7 @@ public void testFieldTypeDefault_ConfiguredIndexedWithSettingOverride() throws I final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name"); assertTrue(mapper.fieldType().hasDocValues()); - if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { + if (mapperService.getIndexSettings().useDocValuesSkipper()) { assertTrue(mapper.fieldType().hasDocValuesSkipper()); } else { assertFalse(mapper.fieldType().hasDocValuesSkipper()); @@ -1060,7 +1060,7 @@ public void testFieldTypeDefault_ConfiguredIndexedWithoutSettingOverride() throw final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name"); assertTrue(mapper.fieldType().hasDocValues()); - if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { + if (mapperService.getIndexSettings().useDocValuesSkipper()) { assertTrue(mapper.fieldType().hasDocValuesSkipper()); } else { assertFalse(mapper.fieldType().hasDocValuesSkipper()); @@ -1082,7 +1082,7 @@ public void testFieldTypeDefault_ConfiguredDocValues() throws IOException { final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name"); assertTrue(mapper.fieldType().hasDocValues()); - if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { + if (mapperService.getIndexSettings().useDocValuesSkipper()) { assertTrue(mapper.fieldType().hasDocValuesSkipper()); } else { assertFalse(mapper.fieldType().hasDocValuesSkipper()); @@ -1122,7 +1122,7 @@ public void testFieldTypeWithSkipDocValues_IndexedFalseDocValuesTrue() throws IO final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name"); assertTrue(mapper.fieldType().hasDocValues()); - if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { + if (mapperService.getIndexSettings().useDocValuesSkipper()) { assertTrue(mapper.fieldType().hasDocValuesSkipper()); } else { assertFalse(mapper.fieldType().hasDocValuesSkipper());