diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java index 013020fc55592..652e759515656 100644 --- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java +++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java @@ -251,7 +251,7 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeDisabledDocValuesSkipper final DateFieldMapper timestampMapper = (DateFieldMapper) mapperService.documentMapper() .mappers() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertTrue(timestampMapper.fieldType().hasDocValues()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); assertTrue(timestampMapper.fieldType().isIndexed()); @@ -273,12 +273,12 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBMode() throws IOException { .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -296,12 +296,12 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeNoTimestampMapping() thr .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -326,12 +326,12 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeTimestampDateNanos() thr .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -354,12 +354,12 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeExplicitTimestampIndexEn .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -381,7 +381,7 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeExplicitTimestampIndexDi final DateFieldMapper timestampMapper = (DateFieldMapper) mapperService.documentMapper() .mappers() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().hasDocValues()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); assertTrue(timestampMapper.fieldType().isIndexed()); @@ -406,12 +406,12 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeWithoutDefaultMapping() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -478,12 +478,12 @@ public void testFieldTypeWithDocValuesSkipper_WithoutTimestampSorting() throws I assertTrue(timestampMapper.fieldType().hasDocValues()); // NOTE: in LogsDB we always sort on @timestamp (and maybe also on host.name) by default if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -502,7 +502,7 @@ public void testFieldTypeWithDocValuesSkipper_StandardMode() throws IOException final DateFieldMapper timestampMapper = (DateFieldMapper) mapperService.documentMapper() .mappers() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().hasDocValues()); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); @@ -528,12 +528,12 @@ public void testFieldTypeWithDocValuesSkipper_CustomTimestampField() throws IOEx final DateFieldMapper defaultTimestamp = (DateFieldMapper) mapperService.documentMapper().mappers().getMapper("@timestamp"); assertTrue(defaultTimestamp.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(defaultTimestamp.fieldType().isIndexed()); assertTrue(defaultTimestamp.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(defaultTimestamp.fieldType().isIndexed()); assertFalse(defaultTimestamp.fieldType().hasDocValuesSkipper()); } @@ -556,7 +556,7 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeDisabledDocValuesSkipper() final DateFieldMapper timestampMapper = (DateFieldMapper) mapperService.documentMapper() .mappers() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertTrue(timestampMapper.fieldType().hasDocValues()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); assertTrue(timestampMapper.fieldType().isIndexed()); @@ -580,12 +580,12 @@ public void testFieldTypeWithDocValuesSkipper_TSDBMode() throws IOException { .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -605,12 +605,12 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeNoTimestampMapping() throw .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -637,12 +637,12 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeTimestampDateNanos() throw .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -667,12 +667,12 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeExplicitTimestampIndexEnab .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } @@ -696,7 +696,7 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeExplicitTimestampIndexDisa final DateFieldMapper timestampMapper = (DateFieldMapper) mapperService.documentMapper() .mappers() .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().hasDocValues()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); assertTrue(timestampMapper.fieldType().isIndexed()); @@ -723,12 +723,12 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeWithoutDefaultMapping() th .getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH); assertTrue(timestampMapper.fieldType().hasDocValues()); if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) { - assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER); assertFalse(timestampMapper.fieldType().isIndexed()); assertTrue(timestampMapper.fieldType().hasDocValuesSkipper()); } else { // TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag - assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled() == false); + assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false); assertTrue(timestampMapper.fieldType().isIndexed()); assertFalse(timestampMapper.fieldType().hasDocValuesSkipper()); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java index 101cb89dc02a6..0544e89dc9a2f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java @@ -235,11 +235,11 @@ public void testSearchIdleStats() throws InterruptedException { } public void testSearchIdleBoolQueryMatchOneIndex() throws InterruptedException { - checkSearchIdleBoolQueryMatchOneIndex(IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + checkSearchIdleBoolQueryMatchOneIndex(IndexSettings.DOC_VALUES_SKIPPER); } public void testSearchIdleBoolQueryMatchOneIndexWithDocValuesSkipper() throws InterruptedException { - assumeTrue("doc values skipper feature should be enabled", IndexSettings.DOC_VALUES_SKIPPER.isEnabled()); + assumeTrue("doc values skipper feature should be enabled", IndexSettings.DOC_VALUES_SKIPPER); checkSearchIdleBoolQueryMatchOneIndex(false); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java index c09f1d48f1583..cd396e755e236 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java @@ -71,13 +71,13 @@ public final class DataStream implements SimpleDiffable, ToXContentObject, IndexAbstraction { - public static final FeatureFlag FAILURE_STORE_FEATURE_FLAG = new FeatureFlag("failure_store"); + public static final boolean FAILURE_STORE_FEATURE_FLAG = new FeatureFlag("failure_store").isEnabled(); public static final TransportVersion ADDED_FAILURE_STORE_TRANSPORT_VERSION = TransportVersions.V_8_12_0; public static final TransportVersion ADDED_AUTO_SHARDING_EVENT_VERSION = TransportVersions.V_8_14_0; public static final TransportVersion ADD_DATA_STREAM_OPTIONS_VERSION = TransportVersions.V_8_16_0; public static boolean isFailureStoreFeatureFlagEnabled() { - return FAILURE_STORE_FEATURE_FLAG.isEnabled(); + return FAILURE_STORE_FEATURE_FLAG; } public static final String BACKING_INDEX_PREFIX = ".ds-"; diff --git a/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java index 422f4018dd69e..a84bc7d00578c 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java @@ -234,7 +234,7 @@ public final class IndexScopedSettings extends AbstractScopedSettings { ) ); - if (IndexSettings.DOC_VALUES_SKIPPER.isEnabled()) { + if (IndexSettings.DOC_VALUES_SKIPPER) { settings.add(IndexSettings.USE_DOC_VALUES_SKIPPER); } BUILT_IN_INDEX_SETTINGS = Collections.unmodifiableSet(settings); diff --git a/server/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java index e1002995559bc..e7ff0f6d1e137 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexSettings.java +++ b/server/src/main/java/org/elasticsearch/index/IndexSettings.java @@ -674,7 +674,7 @@ public boolean isES87TSDBCodecEnabled() { Property.Final ); - public static final FeatureFlag DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper"); + public static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled(); public static final Setting USE_DOC_VALUES_SKIPPER = Setting.boolSetting( "index.mapping.use_doc_values_skipper", false, @@ -1095,7 +1095,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti recoverySourceEnabled = RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING.get(nodeSettings); recoverySourceSyntheticEnabled = DiscoveryNode.isStateless(nodeSettings) == false && scopedSettings.get(RECOVERY_USE_SYNTHETIC_SOURCE_SETTING); - useDocValuesSkipper = DOC_VALUES_SKIPPER.isEnabled() && scopedSettings.get(USE_DOC_VALUES_SKIPPER); + useDocValuesSkipper = DOC_VALUES_SKIPPER && scopedSettings.get(USE_DOC_VALUES_SKIPPER); if (recoverySourceSyntheticEnabled) { if (DiscoveryNode.isStateless(settings)) { throw new IllegalArgumentException("synthetic recovery source is only allowed in stateful"); diff --git a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java index 06949a967eccd..5f887b2b594d3 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -31,7 +31,7 @@ */ public class CodecService implements CodecProvider { - public static final FeatureFlag ZSTD_STORED_FIELDS_FEATURE_FLAG = new FeatureFlag("zstd_stored_fields"); + public static final boolean ZSTD_STORED_FIELDS_FEATURE_FLAG = new FeatureFlag("zstd_stored_fields").isEnabled(); private final Map codecs; @@ -47,7 +47,7 @@ public CodecService(@Nullable MapperService mapperService, BigArrays bigArrays) final var codecs = new HashMap(); Codec legacyBestSpeedCodec = new LegacyPerFieldMapperCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, bigArrays); - if (ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (ZSTD_STORED_FIELDS_FEATURE_FLAG) { codecs.put(DEFAULT_CODEC, new PerFieldMapperCodec(Zstd814StoredFieldsFormat.Mode.BEST_SPEED, mapperService, bigArrays)); } else { codecs.put(DEFAULT_CODEC, legacyBestSpeedCodec); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index ccc24e46937ce..3c71f6bf2db5b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -48,7 +48,7 @@ public class ObjectMapper extends Mapper { private static final Logger logger = LogManager.getLogger(ObjectMapper.class); private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ObjectMapper.class); - public static final FeatureFlag SUB_OBJECTS_AUTO_FEATURE_FLAG = new FeatureFlag("sub_objects_auto"); + public static final boolean SUB_OBJECTS_AUTO_FEATURE_FLAG = new FeatureFlag("sub_objects_auto").isEnabled(); static final NodeFeature SUBOBJECTS_FALSE_MAPPING_UPDATE_FIX = new NodeFeature("mapper.subobjects_false_mapping_update_fix"); public static final String CONTENT_TYPE = "object"; @@ -80,7 +80,7 @@ public static Subobjects from(Object node) { if (value.equalsIgnoreCase("false")) { return DISABLED; } - if (SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled() && value.equalsIgnoreCase("auto")) { + if (SUB_OBJECTS_AUTO_FEATURE_FLAG && value.equalsIgnoreCase("auto")) { return AUTO; } } diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecIntegrationTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecIntegrationTests.java index 038e349c76a6d..d2630f8cd4ecc 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecIntegrationTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecIntegrationTests.java @@ -48,7 +48,7 @@ public void testDefaultCodecLogsdb() { } public void testDefaultCodec() { - assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()); + assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG); var indexService = createIndex("index1"); var storedFieldsFormat = (Zstd814StoredFieldsFormat) indexService.getShard(0) diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 028d2d8e714de..23ee616d54231 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -47,14 +47,14 @@ public class CodecTests extends ESTestCase { public void testResolveDefaultCodecs() throws Exception { - assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()); + assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG); CodecService codecService = createCodecService(); assertThat(codecService.codec("default"), instanceOf(PerFieldMapperCodec.class)); assertThat(codecService.codec("default"), instanceOf(Elasticsearch900Lucene101Codec.class)); } public void testDefault() throws Exception { - assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()); + assumeTrue("Only when zstd_stored_fields feature flag is enabled", CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG); Codec codec = createCodecService().codec("default"); assertEquals( "Zstd814StoredFieldsFormat(compressionMode=ZSTD(level=1), chunkSize=14336, maxDocsPerChunk=128, blockShift=10)", diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java index b093307f3733b..a8d99dafd96b5 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java @@ -152,7 +152,7 @@ public void testPostingsFormat() throws IOException { MapperService mapperService = createMapperService(fieldMapping(this::minimalMapping)); CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); assertThat(((PerFieldMapperCodec) codec).getPostingsFormatForField("field"), instanceOf(latestLuceneCPClass)); } else { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java index 0c68ba5ca0837..c7055c9ff438a 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java @@ -1405,7 +1405,7 @@ public void testMalformedDynamicMapping_v7() throws IOException { } public void testSubobjectsAutoFlatPaths() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createDynamicTemplateAutoSubobjects(); ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.field("foo.metric.count", 10); @@ -1418,7 +1418,7 @@ public void testSubobjectsAutoFlatPaths() throws IOException { } public void testSubobjectsAutoStructuredPaths() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createDynamicTemplateAutoSubobjects(); ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.startObject("foo"); @@ -1441,7 +1441,7 @@ public void testSubobjectsAutoStructuredPaths() throws IOException { } public void testSubobjectsAutoArrayOfObjects() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createDynamicTemplateAutoSubobjects(); ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.startObject("foo"); @@ -1475,7 +1475,7 @@ public void testSubobjectsAutoArrayOfObjects() throws IOException { } public void testSubobjectAutoDynamicNested() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); DocumentMapper mapper = createDocumentMapper(topMapping(b -> { b.startArray("dynamic_templates"); { @@ -1514,7 +1514,7 @@ public void testSubobjectAutoDynamicNested() throws IOException { } public void testRootSubobjectAutoDynamicNested() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); DocumentMapper mapper = createDocumentMapper(topMapping(b -> { b.startArray("dynamic_templates"); { @@ -1548,7 +1548,7 @@ public void testRootSubobjectAutoDynamicNested() throws IOException { } public void testDynamicSubobjectsAutoDynamicFalse() throws Exception { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); // verify that we read the dynamic value properly from the parent mapper. DocumentParser#dynamicOrDefault splits the field // name where dots are found, but it does that only for the parent prefix e.g. metrics.service and not for the leaf suffix time.max DocumentMapper mapper = createDocumentMapper(topMapping(b -> { @@ -1612,7 +1612,7 @@ public void testDynamicSubobjectsAutoDynamicFalse() throws Exception { } public void testSubobjectsAutoWithInnerNestedFromDynamicTemplate() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); DocumentMapper mapper = createDocumentMapper(topMapping(b -> { b.startArray("dynamic_templates"); { @@ -2080,7 +2080,7 @@ public void testSubobjectsFalseFlattened() throws IOException { } public void testSubobjectsAutoFlattened() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); String mapping = """ { "_doc": { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java index 8582f26349ef2..6dfcf5d7399d2 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java @@ -169,7 +169,7 @@ public void testMergeEnabledForIndexTemplates() throws IOException { assertEquals(ObjectMapper.Subobjects.ENABLED, objectMapper.subobjects()); assertTrue(objectMapper.sourceKeepMode().isEmpty()); - if (ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()) { + if (ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG) { // Setting 'enabled' to true is allowed, and updates the mapping. update = Strings.toString( XContentFactory.jsonBuilder() @@ -539,7 +539,7 @@ public void testSubobjectsCannotBeUpdatedOnRoot() throws IOException { } public void testSubobjectsAuto() throws Exception { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mapping(b -> { b.startObject("metrics.service"); { @@ -569,7 +569,7 @@ public void testSubobjectsAuto() throws Exception { } public void testSubobjectsAutoWithInnerObject() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mapping(b -> { b.startObject("metrics.service"); { @@ -603,7 +603,7 @@ public void testSubobjectsAutoWithInnerObject() throws IOException { } public void testSubobjectsAutoWithInnerNested() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mapping(b -> { b.startObject("metrics.service"); { @@ -625,7 +625,7 @@ public void testSubobjectsAutoWithInnerNested() throws IOException { } public void testSubobjectsAutoRoot() throws Exception { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mappingWithSubobjects(b -> { b.startObject("metrics.service.time"); b.field("type", "long"); @@ -646,7 +646,7 @@ public void testSubobjectsAutoRoot() throws Exception { } public void testSubobjectsAutoRootWithInnerObject() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mappingWithSubobjects(b -> { b.startObject("metrics.service.time"); { @@ -667,7 +667,7 @@ public void testSubobjectsAutoRootWithInnerObject() throws IOException { } public void testSubobjectsAutoRootWithInnerNested() throws IOException { - assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG.isEnabled()); + assumeTrue("only test when feature flag for subobjects auto is enabled", ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG); MapperService mapperService = createMapperService(mappingWithSubobjects(b -> { b.startObject("metrics.service"); b.field("type", "nested"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java index 62caaff6ca778..4ebda66ef0d6c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java @@ -1992,7 +1992,7 @@ public void testKnnVectorsFormat() throws IOException { CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); KnnVectorsFormat knnVectorsFormat; - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); } else { @@ -2030,7 +2030,7 @@ public void testKnnQuantizedFlatVectorsFormat() throws IOException { CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); KnnVectorsFormat knnVectorsFormat; - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); } else { @@ -2081,7 +2081,7 @@ public void testKnnQuantizedHNSWVectorsFormat() throws IOException { CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); KnnVectorsFormat knnVectorsFormat; - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); } else { @@ -2127,7 +2127,7 @@ public void testKnnBBQHNSWVectorsFormat() throws IOException { CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); KnnVectorsFormat knnVectorsFormat; - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); } else { @@ -2185,7 +2185,7 @@ public void testKnnHalfByteQuantizedHNSWVectorsFormat() throws IOException { CodecService codecService = new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE); Codec codec = codecService.codec("default"); KnnVectorsFormat knnVectorsFormat; - if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG.isEnabled()) { + if (CodecService.ZSTD_STORED_FIELDS_FEATURE_FLAG) { assertThat(codec, instanceOf(PerFieldMapperCodec.class)); knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); } else { diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java index d6eddf1883489..e7e78b39f3421 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java @@ -362,7 +362,7 @@ private void fail(Expression exp, String message, Object... args) { @Override public PlanFactory visitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx) { - if (false == EsqlPlugin.INLINESTATS_FEATURE_FLAG.isEnabled()) { + if (false == EsqlPlugin.INLINESTATS_FEATURE_FLAG) { throw new ParsingException(source(ctx), "INLINESTATS command currently requires a snapshot build"); } List aggFields = visitAggFields(ctx.stats); diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java index 56773005edd5c..6ecfccb28e462 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java @@ -81,7 +81,7 @@ import java.util.function.Supplier; public class EsqlPlugin extends Plugin implements ActionPlugin { - public static final FeatureFlag INLINESTATS_FEATURE_FLAG = new FeatureFlag("esql_inlinestats"); + public static final boolean INLINESTATS_FEATURE_FLAG = new FeatureFlag("esql_inlinestats").isEnabled(); public static final String ESQL_WORKER_THREAD_POOL_NAME = "esql_worker"; diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java index b35bc9e9c0f9f..69345e009c344 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java @@ -337,7 +337,7 @@ public Collection createComponents(PluginServices services) { // Only add InferenceServiceNodeLocalRateLimitCalculator (which is a ClusterStateListener) for cluster aware rate limiting, // if the rate limiting feature flags are enabled, otherwise provide noop implementation InferenceServiceRateLimitCalculator calculator; - if (INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG.isEnabled()) { + if (INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG) { calculator = new InferenceServiceNodeLocalRateLimitCalculator(services.clusterService(), serviceRegistry); } else { calculator = new NoopNodeLocalRateLimitCalculator(); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/common/InferenceAPIClusterAwareRateLimitingFeature.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/common/InferenceAPIClusterAwareRateLimitingFeature.java index 22de92526ba89..518bd4ea85d9e 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/common/InferenceAPIClusterAwareRateLimitingFeature.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/common/InferenceAPIClusterAwareRateLimitingFeature.java @@ -19,9 +19,9 @@ */ public class InferenceAPIClusterAwareRateLimitingFeature { - public static final FeatureFlag INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG = new FeatureFlag( + public static final boolean INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG = new FeatureFlag( "inference_cluster_aware_rate_limiting" - ); + ).isEnabled(); private InferenceAPIClusterAwareRateLimitingFeature() {} diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/common/InferenceServiceNodeLocalRateLimitCalculatorTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/common/InferenceServiceNodeLocalRateLimitCalculatorTests.java index 5c7eeacd6d1d5..0914a081acf07 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/common/InferenceServiceNodeLocalRateLimitCalculatorTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/common/InferenceServiceNodeLocalRateLimitCalculatorTests.java @@ -36,7 +36,7 @@ public void setUp() throws Exception { assumeTrue( "If inference_cluster_aware_rate_limiting_feature_flag_enabled=false we'll fallback to " + "NoopNodeLocalRateLimitCalculator, which shouldn't be tested by this class.", - InferenceAPIClusterAwareRateLimitingFeature.INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG.isEnabled() + InferenceAPIClusterAwareRateLimitingFeature.INFERENCE_API_CLUSTER_AWARE_RATE_LIMITING_FEATURE_FLAG ); }