From 4e21c9d7d50c76810f3021b9f76a0d07d112c8b1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 27 Jun 2024 13:57:39 -0400 Subject: [PATCH 1/2] Move getMetadataFields to IndexService Signed-off-by: Craig Perkins --- .../src/main/java/org/opensearch/index/IndexService.java | 9 +++++++++ .../java/org/opensearch/index/mapper/MapperService.java | 7 ------- .../org/opensearch/index/mapper/MapperServiceTests.java | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/org/opensearch/index/IndexService.java b/server/src/main/java/org/opensearch/index/IndexService.java index a7849bcf80474..94e37606b85f0 100644 --- a/server/src/main/java/org/opensearch/index/IndexService.java +++ b/server/src/main/java/org/opensearch/index/IndexService.java @@ -156,6 +156,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust private final CheckedFunction readerWrapper; private final IndexCache indexCache; private final MapperService mapperService; + private final MapperRegistry mapperRegistry; private final NamedXContentRegistry xContentRegistry; private final NamedWriteableRegistry namedWriteableRegistry; private final SimilarityService similarityService; @@ -239,6 +240,7 @@ public IndexService( this.circuitBreakerService = circuitBreakerService; this.expressionResolver = expressionResolver; this.valuesSourceRegistry = valuesSourceRegistry; + this.mapperRegistry = mapperRegistry; if (needsMapperService(indexSettings, indexCreationContext)) { assert indexAnalyzers != null; this.mapperService = new MapperService( @@ -1233,6 +1235,13 @@ private TimeValue getRefreshInterval() { return clusterDefaultRefreshIntervalSupplier.get(); } + /** + * Returns a set containing the registered metadata fields + */ + public Set getMetadataFields() { + return Collections.unmodifiableSet(mapperRegistry.getMetadataMapperParsers().keySet()); + } + /** * Base asynchronous task * diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java index a1f3894c9f14c..fc8654216e187 100644 --- a/server/src/main/java/org/opensearch/index/mapper/MapperService.java +++ b/server/src/main/java/org/opensearch/index/mapper/MapperService.java @@ -714,13 +714,6 @@ public boolean isMetadataField(String field) { return mapperRegistry.isMetadataField(field); } - /** - * Returns a set containing the registered metadata fields - */ - public Set getMetadataFields() { - return Collections.unmodifiableSet(mapperRegistry.getMetadataMapperParsers().keySet()); - } - /** * An analyzer wrapper that can lookup fields within the index mappings */ diff --git a/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java index b9c8866e69cbb..c4549dc297e39 100644 --- a/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java @@ -92,8 +92,8 @@ public void testTypeValidation() { } public void testGetMetadataFieldsReturnsExpectedSet() throws Throwable { - final MapperService mapperService = createIndex("test1").mapperService(); - assertEquals(mapperService.getMetadataFields(), IndicesModule.getBuiltInMetadataFields()); + final IndexService indexService = createIndex("test1"); + assertEquals(indexService.getMetadataFields(), IndicesModule.getBuiltInMetadataFields()); } public void testPreflightUpdateDoesNotChangeMapping() throws Throwable { From 5cc3b1f6a68fbf9b48e8a9c3b20a9608b60d033b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 27 Jun 2024 14:09:16 -0400 Subject: [PATCH 2/2] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f8fff1db214a..d2dbcd46070c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - unsignedLongRangeQuery now returns MatchNoDocsQuery if the lower bounds are greater than the upper bounds ([#14416](https://github.com/opensearch-project/OpenSearch/pull/14416)) - Updated the `indices.query.bool.max_clause_count` setting from being static to dynamically updateable ([#13568](https://github.com/opensearch-project/OpenSearch/pull/13568)) - Make the class CommunityIdProcessor final ([#14448](https://github.com/opensearch-project/OpenSearch/pull/14448)) +- Move getMetadataFields to IndexService ([#14586](https://github.com/opensearch-project/OpenSearch/pull/14586)) ### Deprecated