From 843d670e06fa2e3ebf538c7690052a65ab6a2f11 Mon Sep 17 00:00:00 2001 From: Oleksandr Kolomiiets Date: Thu, 25 Apr 2024 14:24:56 -0700 Subject: [PATCH] More cleanup --- .../index/mapper/MapperServiceFactory.java | 2 +- .../search/QueryParserHelperBenchmark.java | 2 +- .../metadata/IndexMetadataVerifier.java | 2 +- .../org/elasticsearch/index/IndexModule.java | 6 ++--- .../org/elasticsearch/index/IndexService.java | 2 +- .../mapper}/MapperMetrics.java | 16 ++---------- .../index/mapper/MapperService.java | 7 +++-- .../index/mapper/MappingParserContext.java | 3 +-- .../index/mapper/SourceFieldMapper.java | 26 +++++++++---------- .../index/mapper/SourceFieldMetrics.java | 8 +++--- .../index/query/SearchExecutionContext.java | 2 +- .../elasticsearch/indices/IndicesService.java | 1 + .../indices/IndicesServiceBuilder.java | 1 + .../elasticsearch/node/NodeConstruction.java | 2 +- .../metadata/IndexMetadataVerifierTests.java | 2 +- .../gateway/GatewayMetaStateTests.java | 2 +- .../elasticsearch/index/IndexModuleTests.java | 2 +- .../elasticsearch/index/codec/CodecTests.java | 2 +- .../index/mapper/MappingParserTests.java | 1 - .../index/mapper/ParametrizedMapperTests.java | 1 - .../index/mapper/TypeParsersTests.java | 1 - .../query/SearchExecutionContextTests.java | 7 +++-- .../indices/cluster/ClusterStateChanges.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 2 +- .../elasticsearch/index/MapperTestUtils.java | 2 +- .../index/engine/TranslogHandler.java | 2 +- .../index/mapper/MapperServiceTestCase.java | 1 - .../mapper/TestDocumentParserContext.java | 1 - .../aggregations/AggregatorTestCase.java | 7 +++-- .../test/AbstractBuilderTestCase.java | 2 +- 30 files changed, 55 insertions(+), 62 deletions(-) rename server/src/main/java/org/elasticsearch/{indices => index/mapper}/MapperMetrics.java (59%) diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java index d51d563c8db84..e3d1874fb8050 100644 --- a/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java +++ b/benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.ProvidedIdFieldMapper; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.script.ScriptContext; diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java index 4bab22cc99775..8855a6474f253 100644 --- a/benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java +++ b/benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptCompiler; diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java index 69d02b9d859ee..ae2c07f3dc625 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.MapperRegistry; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.script.ScriptService; import org.elasticsearch.xcontent.NamedXContentRegistry; diff --git a/server/src/main/java/org/elasticsearch/index/IndexModule.java b/server/src/main/java/org/elasticsearch/index/IndexModule.java index a158f40295721..60a5e62751418 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/server/src/main/java/org/elasticsearch/index/IndexModule.java @@ -53,7 +53,7 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.FsDirectoryFactory; import org.elasticsearch.indices.IndicesQueryCache; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.indices.recovery.RecoveryState; @@ -477,7 +477,7 @@ public IndexService newIndexService( ValuesSourceRegistry valuesSourceRegistry, IndexStorePlugin.IndexFoldersDeletionListener indexFoldersDeletionListener, Map snapshotCommitSuppliers, - MapperMetrics metrics + MapperMetrics mapperMetrics ) throws IOException { final IndexEventListener eventListener = freeze(); Function> readerWrapperFactory = indexReaderWrapper @@ -539,7 +539,7 @@ public IndexService newIndexService( indexFoldersDeletionListener, snapshotCommitSupplier, indexCommitListener.get(), - metrics + mapperMetrics ); success = true; return indexService; diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java index f3dfcfa7181a9..74a2796a5514b 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexService.java +++ b/server/src/main/java/org/elasticsearch/index/IndexService.java @@ -77,7 +77,7 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.cluster.IndicesClusterStateService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; diff --git a/server/src/main/java/org/elasticsearch/indices/MapperMetrics.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperMetrics.java similarity index 59% rename from server/src/main/java/org/elasticsearch/indices/MapperMetrics.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperMetrics.java index 76fdbdbf002b6..a0dc28a25d3da 100644 --- a/server/src/main/java/org/elasticsearch/indices/MapperMetrics.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperMetrics.java @@ -6,24 +6,12 @@ * Side Public License, v 1. */ -package org.elasticsearch.indices; - -import org.elasticsearch.index.mapper.SourceFieldMetrics; +package org.elasticsearch.index.mapper; /** * Groups together all metrics used in mappers. * Main purpose of this class is to avoid verbosity of passing individual metric instances around. */ -public class MapperMetrics { +public record MapperMetrics(SourceFieldMetrics sourceFieldMetrics) { public static MapperMetrics NOOP = new MapperMetrics(SourceFieldMetrics.NOOP); - - private final SourceFieldMetrics sourceFieldMetrics; - - public MapperMetrics(SourceFieldMetrics sourceFieldMetrics) { - this.sourceFieldMetrics = sourceFieldMetrics; - } - - public SourceFieldMetrics getSyntheticSourceMetrics() { - return sourceFieldMetrics; - } } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java index b19a7e60b7a59..89e7be9b9f1ab 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -28,7 +28,6 @@ import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xcontent.ToXContent; @@ -790,9 +789,13 @@ public MapperRegistry getMapperRegistry() { public SourceLoader getSourceLoader(MappingLookup mappingLookup, boolean forceSyntheticSource) { if (forceSyntheticSource) { - return new SourceLoader.Synthetic(mappingLookup.getMapping(), mapperMetrics.getSyntheticSourceMetrics()); + return getSyntheticSourceLoader(mappingLookup); } return mappingLookup.newSourceLoader(); } + + public SourceLoader getSyntheticSourceLoader(MappingLookup mappingLookup) { + return new SourceLoader.Synthetic(mappingLookup.getMapping(), mapperMetrics.sourceFieldMetrics()); + } } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java b/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java index eb936837650c6..c90725cdbc9b3 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java @@ -16,7 +16,6 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.index.similarity.SimilarityProvider; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import java.util.function.Function; @@ -136,7 +135,7 @@ public ScriptCompiler scriptCompiler() { return scriptCompiler; } - public MapperMetrics getIndicesMetrics() { + public MapperMetrics getMapperMetrics() { return mapperMetrics; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java index ea0c585269c28..cb85a159fad23 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java @@ -133,9 +133,8 @@ public static class Builder extends MetadataFieldMapper.Builder { ); private final IndexMode indexMode; - private final SourceFieldMetrics sourceFieldMetrics; - private final boolean supportsNonDefaultParameterValues; + private final SourceFieldMetrics sourceFieldMetrics; public Builder(IndexMode indexMode, final Settings settings, SourceFieldMetrics sourceFieldMetrics) { super(Defaults.NAME); @@ -200,8 +199,8 @@ public SourceFieldMapper build() { SourceFieldMapper sourceFieldMapper = new SourceFieldMapper( mode.get(), enabled.get(), - includes.getValue().toArray(String[]::new), - excludes.getValue().toArray(String[]::new), + includes.getValue().toArray(Strings.EMPTY_ARRAY), + excludes.getValue().toArray(Strings.EMPTY_ARRAY), indexMode, sourceFieldMetrics ); @@ -213,14 +212,16 @@ public SourceFieldMapper build() { } - public static final TypeParser PARSER = new ConfigurableTypeParser( - c -> c.getIndexSettings().getMode() == IndexMode.TIME_SERIES - ? c.getIndexSettings().getIndexVersionCreated().onOrAfter(IndexVersions.V_8_7_0) - ? tsdbDefault(c.getIndicesMetrics().getSyntheticSourceMetrics()) - : tsdbLegacyDefault(c.getIndicesMetrics().getSyntheticSourceMetrics()) - : defaultMapper(c.getIndicesMetrics().getSyntheticSourceMetrics()), - c -> new Builder(c.getIndexSettings().getMode(), c.getSettings(), c.getIndicesMetrics().getSyntheticSourceMetrics()) - ); + public static final TypeParser PARSER = new ConfigurableTypeParser(c -> { + var metrics = c.getMapperMetrics().sourceFieldMetrics(); + + if (c.getIndexSettings().getMode() == IndexMode.TIME_SERIES) { + return c.getIndexSettings().getIndexVersionCreated().onOrAfter(IndexVersions.V_8_7_0) + ? tsdbDefault(metrics) + : tsdbLegacyDefault(metrics); + } + return defaultMapper(metrics); + }, c -> new Builder(c.getIndexSettings().getMode(), c.getSettings(), c.getMapperMetrics().sourceFieldMetrics())); static final class SourceFieldType extends MappedFieldType { private final boolean enabled; @@ -269,7 +270,6 @@ public BlockLoader blockLoader(BlockLoaderContext blContext) { private final String[] includes; private final String[] excludes; private final SourceFilter sourceFilter; - private final IndexMode indexMode; private final SourceFieldMetrics sourceFieldMetrics; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMetrics.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMetrics.java index aaee30840ca7f..0e6ce79fd2170 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMetrics.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMetrics.java @@ -18,16 +18,16 @@ * Contains metrics for operations involving source field. */ public class SourceFieldMetrics { - public static SourceFieldMetrics NOOP = new SourceFieldMetrics(MeterRegistry.NOOP, () -> 0); + public static final SourceFieldMetrics NOOP = new SourceFieldMetrics(MeterRegistry.NOOP, () -> 0); public static final String SYNTHETIC_SOURCE_LOAD_LATENCY = "es.mapper.synthetic_source.load.latency.histogram"; private final LongSupplier relativeTimeSupplier; - private final LongHistogram synthethicSourceLoadLatency; + private final LongHistogram syntheticSourceLoadLatency; public SourceFieldMetrics(MeterRegistry meterRegistry, LongSupplier relativeTimeSupplier) { - this.synthethicSourceLoadLatency = meterRegistry.registerLongHistogram( + this.syntheticSourceLoadLatency = meterRegistry.registerLongHistogram( SYNTHETIC_SOURCE_LOAD_LATENCY, "Time it takes to load fields and construct synthetic source", "ms" @@ -40,6 +40,6 @@ public LongSupplier getRelativeTimeSupplier() { } public void recordSyntheticSourceLoadLatency(TimeValue value) { - this.synthethicSourceLoadLatency.record(value.millis()); + this.syntheticSourceLoadLatency.record(value.millis()); } } diff --git a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java index a4f6fb147b86c..410b088b5fc90 100644 --- a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java +++ b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java @@ -479,7 +479,7 @@ public boolean containsBrokenAnalysis(String field) { public SearchLookup lookup() { if (this.lookup == null) { SourceProvider sourceProvider = isSourceSynthetic() - ? SourceProvider.fromSyntheticSource(mapperService.getSourceLoader(mappingLookup, true)) + ? SourceProvider.fromSyntheticSource(mapperService.getSyntheticSourceLoader(mappingLookup)) : SourceProvider.fromStoredFields(); setLookupProviders(sourceProvider, LeafFieldLookupProvider.fromStoredFields()); } diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 477572d255270..faabb61a77516 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -100,6 +100,7 @@ import org.elasticsearch.index.get.GetStats; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.IdFieldMapper; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.index.mapper.MapperRegistry; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MappingLookup; diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java b/server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java index 661dcc8bfb24f..d56cf3c2c1e1a 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesServiceBuilder.java @@ -24,6 +24,7 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AnalysisRegistry; import org.elasticsearch.index.engine.EngineFactory; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.index.mapper.MapperRegistry; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.plugins.EnginePlugin; diff --git a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java index 6b61ea3228188..a37acef7c9112 100644 --- a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java +++ b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java @@ -116,7 +116,7 @@ import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.IndicesServiceBuilder; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.ShardLimitValidator; import org.elasticsearch.indices.SystemIndexMappingUpdateService; import org.elasticsearch.indices.SystemIndices; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java index 47c12b580b238..51d1e6e855486 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java @@ -15,7 +15,7 @@ import org.elasticsearch.index.IndexVersion; import org.elasticsearch.index.IndexVersions; import org.elasticsearch.index.mapper.MapperRegistry; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.index.IndexVersionUtils; diff --git a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java index 114007ccab560..4e12627a158da 100644 --- a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java @@ -18,7 +18,7 @@ import org.elasticsearch.cluster.version.CompatibilityVersionsUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexVersion; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.plugins.ClusterCoordinationPlugin; import org.elasticsearch.plugins.MetadataUpgrader; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index e4d287968f624..f186ceac7c2d2 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -77,7 +77,7 @@ import org.elasticsearch.index.store.Store; import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.IndicesQueryCache; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.TestIndexNameExpressionResolver; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.breaker.CircuitBreakerService; 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 5d0467829cd67..c00edd17a5c02 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperRegistry; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java index 494fc31912fa2..736e02a118165 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java @@ -19,7 +19,6 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.script.ScriptService; import org.elasticsearch.test.TransportVersionUtils; import org.elasticsearch.test.index.IndexVersionUtils; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java index e6e2e733f319c..432085fc9201d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java @@ -23,7 +23,6 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.FieldMapper.Parameter; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptCompiler; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java index e11fd5c64a15d..3cd21797ca5d9 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java @@ -20,7 +20,6 @@ import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TransportVersionUtils; diff --git a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java index e403f7dba78ea..6c4572d3ad04f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java @@ -67,7 +67,7 @@ import org.elasticsearch.index.mapper.TestRuntimeField; import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.script.field.DelegateDocValuesField; import org.elasticsearch.script.field.DocValuesScriptFieldFactory; @@ -559,10 +559,13 @@ private static MapperService createMapperService(IndexSettings indexSettings, Ma when(mapperService.isMultiField(anyString())).then( (Answer) invocation -> mappingLookup.isMultiField(invocation.getArgument(0)) ); - when(mapperService.getSourceLoader(any(), eq(true))).thenReturn( + when(mapperService.getSyntheticSourceLoader(any())).thenReturn( new SourceLoader.Synthetic(mappingLookup.getMapping(), SourceFieldMetrics.NOOP) ); when(mapperService.getSourceLoader(any(), eq(false))).thenReturn(mappingLookup.newSourceLoader()); + when(mapperService.getSourceLoader(any(), eq(true))).thenReturn( + new SourceLoader.Synthetic(mappingLookup.getMapping(), SourceFieldMetrics.NOOP) + ); return mapperService; } diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index 5b3193f22f904..4300518a583e2 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -93,7 +93,7 @@ import org.elasticsearch.index.shard.ShardLongFieldRange; import org.elasticsearch.indices.EmptySystemIndices; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.ShardLimitValidator; import org.elasticsearch.indices.TestIndexNameExpressionResolver; import org.elasticsearch.snapshots.EmptySnapshotsInfoService; diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index c9cedda09411b..544db73af7053 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -148,7 +148,7 @@ import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.IndicesServiceBuilder; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.ShardLimitValidator; import org.elasticsearch.indices.TestIndexNameExpressionResolver; import org.elasticsearch.indices.analysis.AnalysisModule; diff --git a/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java b/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java index 5bf71735a3816..33fa6c47e46c7 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java @@ -18,7 +18,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.script.ScriptCompiler; import org.elasticsearch.test.IndexSettingsModule; import org.elasticsearch.xcontent.NamedXContentRegistry; diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java b/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java index 677cd49b0f4b9..cd0f40d37f141 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java @@ -22,7 +22,7 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xcontent.XContentParserConfiguration; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index 2d937c20b6072..7f3764c1226ac 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -55,7 +55,6 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/TestDocumentParserContext.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/TestDocumentParserContext.java index 3b151cb2157f7..1c6a9f6fb4060 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/TestDocumentParserContext.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/TestDocumentParserContext.java @@ -12,7 +12,6 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexVersion; -import org.elasticsearch.indices.MapperMetrics; import org.elasticsearch.xcontent.XContentParser; /** diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index a2184da18e99e..b23c719b85462 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -116,7 +116,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.CrankyCircuitBreakerService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; @@ -372,10 +372,13 @@ public void onRemoval(ShardId shardId, Accountable accountable) {} public void onCache(ShardId shardId, Accountable accountable) {} }); MapperService mapperService = mock(MapperService.class); - when(mapperService.getSourceLoader(any(), eq(true))).thenReturn( + when(mapperService.getSyntheticSourceLoader(any())).thenReturn( new SourceLoader.Synthetic(mappingLookup.getMapping(), SourceFieldMetrics.NOOP) ); when(mapperService.getSourceLoader(any(), eq(false))).thenReturn(mappingLookup.newSourceLoader()); + when(mapperService.getSourceLoader(any(), eq(true))).thenReturn( + new SourceLoader.Synthetic(mappingLookup.getMapping(), SourceFieldMetrics.NOOP) + ); SearchExecutionContext searchExecutionContext = new SearchExecutionContext( 0, -1, diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index d3baeb2d6388d..5cc67ca1c1715 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -61,7 +61,7 @@ import org.elasticsearch.index.shard.ShardLongFieldRange; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.MapperMetrics; +import org.elasticsearch.index.mapper.MapperMetrics; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;