Skip to content

Update DocumentSizeReporter interface to use Index rather than just the index name. #126977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 29, 2025
Merged

Update DocumentSizeReporter interface to use Index rather than just the index name. #126977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0d0e61
Pass Index to DocumentSizeReporter
mosche Apr 16, 2025
6ae858d
Merge branch 'main' into metering/keep_index_uuid
mosche Apr 17, 2025
0536aa6
fix test
mosche Apr 17, 2025
8b6ef04
Merge branch 'main' into metering/keep_index_uuid
mosche Apr 17, 2025
e7cb773
Merge branch 'main' into metering/keep_index_uuid
mosche Apr 28, 2025
2bfbe10
Merge branch 'main' into metering/keep_index_uuid
mosche Apr 28, 2025
d0ca983
Merge branch 'main' into metering/keep_index_uuid
mosche Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...lusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -104,7 +105,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
);
Expand All @@ -131,22 +132,22 @@ public <T> XContentMeteringParserDecorator newMeteringParserDecorator(IndexReque

@Override
public DocumentSizeReporter newDocumentSizeReporter(
String indexName,
Index index,
MapperService mapperService,
DocumentSizeAccumulator documentSizeAccumulator
) {
return new TestDocumentSizeReporter(indexName);
return new TestDocumentSizeReporter(index);
}
};
}
}

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
Expand All @@ -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));
}
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/plugins/internal/DocumentParsingProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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
) {
Expand Down