From e0d0e616fa312788c62c3a4543446cad7a380eb9 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Wed, 16 Apr 2025 17:37:36 +0200 Subject: [PATCH 1/2] Pass Index to DocumentSizeReporter --- .../plugins/internal/XContentMeteringParserDecoratorIT.java | 2 +- .../plugins/internal/DocumentParsingProvider.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java index f70667b91aec8..dabc4ca75f208 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java @@ -104,7 +104,7 @@ public IndexResult index(Index index) throws IOException { IndexResult result = super.index(index); DocumentSizeReporter documentParsingReporter = documentParsingProvider.newDocumentSizeReporter( - shardId.getIndexName(), + shardId.getIndex(), config().getMapperService(), DocumentSizeAccumulator.EMPTY_INSTANCE ); diff --git a/server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java b/server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java index 9df7fd4c3bd43..1334f13d94b37 100644 --- a/server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java +++ b/server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java @@ -10,6 +10,7 @@ package org.elasticsearch.plugins.internal; import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; /** @@ -23,7 +24,7 @@ public interface DocumentParsingProvider { * @return an instance of a reporter to use when parsing has been completed and indexing successful */ default DocumentSizeReporter newDocumentSizeReporter( - String indexName, + Index index, MapperService mapperService, DocumentSizeAccumulator documentSizeAccumulator ) { From 0536aa6ab9c250b5748a64b9acd7efce4eba2d06 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Thu, 17 Apr 2025 10:01:43 +0200 Subject: [PATCH 2/2] fix test --- .../internal/XContentMeteringParserDecoratorIT.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java index dabc4ca75f208..b59afbdc461f8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java @@ -10,6 +10,7 @@ package org.elasticsearch.plugins.internal; import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.engine.EngineFactory; import org.elasticsearch.index.engine.InternalEngine; @@ -131,11 +132,11 @@ public XContentMeteringParserDecorator newMeteringParserDecorator(IndexReque @Override public DocumentSizeReporter newDocumentSizeReporter( - String indexName, + Index index, MapperService mapperService, DocumentSizeAccumulator documentSizeAccumulator ) { - return new TestDocumentSizeReporter(indexName); + return new TestDocumentSizeReporter(index); } }; } @@ -143,10 +144,10 @@ public DocumentSizeReporter newDocumentSizeReporter( public static class TestDocumentSizeReporter implements DocumentSizeReporter { - private final String indexName; + private final Index index; - public TestDocumentSizeReporter(String indexName) { - this.indexName = indexName; + public TestDocumentSizeReporter(Index index) { + this.index = index; } @Override @@ -155,7 +156,7 @@ public void onIndexingCompleted(ParsedDocument parsedDocument) { if (delta > XContentMeteringParserDecorator.UNKNOWN_SIZE) { COUNTER.addAndGet(delta); } - assertThat(indexName, equalTo(TEST_INDEX_NAME)); + assertThat(index.getName(), equalTo(TEST_INDEX_NAME)); } }