From d5074c61b6814548c8a758592e642fe7419ceb8a Mon Sep 17 00:00:00 2001 From: Stuart Tettemer Date: Thu, 27 Jul 2023 17:22:06 -0500 Subject: [PATCH] Change visibility of Engine.getLastCommittedSegmentInfos() to public --- .../elasticsearch/index/engine/Engine.java | 13 +---- .../index/engine/InternalEngine.java | 2 +- .../index/engine/ReadOnlyEngine.java | 2 +- .../index/engine/SegmentFileSize.java | 35 ------------- .../index/engine/InternalEngineTests.java | 52 ------------------- 5 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 server/src/main/java/org/elasticsearch/index/engine/SegmentFileSize.java diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java index a83843ef5b103..953c77e2826f4 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -87,8 +87,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Consumer; import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; import static org.elasticsearch.core.Strings.format; import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM; @@ -148,16 +146,7 @@ public final EngineConfig config() { return engineConfig; } - protected abstract SegmentInfos getLastCommittedSegmentInfos(); - - /** - * Get the a lazily loaded file size for all segments in the last commit - */ - public List getLastCommittedSegmentFileSizes() { - return StreamSupport.stream(getLastCommittedSegmentInfos().spliterator(), false) - .map(SegmentFileSize::new) - .collect(Collectors.toList()); - } + public abstract SegmentInfos getLastCommittedSegmentInfos(); public MergeStats getMergeStats() { return new MergeStats(); diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index a17441b1f37b2..684214b2692b5 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -2478,7 +2478,7 @@ protected boolean maybeFailEngine(String source, Exception e) { } @Override - protected SegmentInfos getLastCommittedSegmentInfos() { + public SegmentInfos getLastCommittedSegmentInfos() { return lastCommittedSegmentInfos; } diff --git a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java index d428bdbfb13db..b38cc24e107ea 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java @@ -287,7 +287,7 @@ protected ReferenceManager getReferenceManager(Sea } @Override - protected SegmentInfos getLastCommittedSegmentInfos() { + public SegmentInfos getLastCommittedSegmentInfos() { return lastCommittedSegmentInfos; } diff --git a/server/src/main/java/org/elasticsearch/index/engine/SegmentFileSize.java b/server/src/main/java/org/elasticsearch/index/engine/SegmentFileSize.java deleted file mode 100644 index 7b58a276c333f..0000000000000 --- a/server/src/main/java/org/elasticsearch/index/engine/SegmentFileSize.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.index.engine; - -import org.apache.lucene.index.SegmentCommitInfo; -import org.apache.lucene.util.StringHelper; - -import java.io.IOException; - -/** - * Lazily get the file size for a segment. - */ -public class SegmentFileSize { - public final String id; - private final SegmentCommitInfo commit; - - public SegmentFileSize(SegmentCommitInfo commit) { - this.id = StringHelper.idToString(commit.getId()); - this.commit = commit; - } - - public String id() { - return id; - } - - public long sizeInBytes() throws IOException { - return commit.sizeInBytes(); - } -} diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index af0cb71659067..0a6105b314dd6 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -510,58 +510,6 @@ public void testSegments() throws Exception { assertThat(segments.get(1).committed, equalTo(committed)); } } - - public void testSegmentFileSizes() throws Exception { - final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED); - try ( - Store store = createStore(); - InternalEngine engine = createEngine( - config(defaultSettings, store, createTempDir(), NoMergePolicy.INSTANCE, null, null, globalCheckpoint::get) - ) - ) { - assertThat(engine.segments(), empty()); - int numDocsSeg1 = 100; - for (int i = 0; i < numDocsSeg1; i++) { - String id = Integer.toString(i); - ParsedDocument doc = testParsedDocument(id, null, testDocument(), B_1, null); - engine.index(indexForDoc(doc)); - } - List fileSizes = engine.getLastCommittedSegmentFileSizes(); - assertThat(fileSizes, empty()); - List segments = engine.segments(); - assertThat(segments, empty()); - - engine.flush(); - segments = engine.segments(); - fileSizes = engine.getLastCommittedSegmentFileSizes(); - assertThat(fileSizes, hasSize(1)); - assertThat(fileSizes.get(0).sizeInBytes(), greaterThan(0L)); - assertThat(segments, hasSize(1)); - assertThat(segments.get(0).getNumDocs(), equalTo(numDocsSeg1)); - assertThat(segments.get(0).getDeletedDocs(), equalTo(0)); - assertTrue(segments.get(0).committed); - int numDocsSeg2 = 20; - for (int i = 0; i < numDocsSeg2; i++) { - engine.index(indexForDoc(testParsedDocument(UUIDs.randomBase64UUID(), null, testDocument(), B_1, null))); - } - - engine.flush(); - segments = engine.segments(); - fileSizes = engine.getLastCommittedSegmentFileSizes(); - assertThat(fileSizes, hasSize(2)); - assertThat(segments, hasSize(2)); - assertThat(segments.get(0).getNumDocs(), equalTo(numDocsSeg1)); - assertThat(segments.get(0).getDeletedDocs(), equalTo(0)); - assertTrue(segments.get(0).committed); - assertThat(fileSizes.get(0).sizeInBytes(), greaterThan(0L)); - - assertThat(segments.get(1).getNumDocs(), equalTo(numDocsSeg2)); - assertThat(segments.get(1).getDeletedDocs(), equalTo(0)); - assertTrue(segments.get(1).committed); - assertThat(fileSizes.get(1).sizeInBytes(), greaterThan(0L)); - } - } - public void testCommitStats() throws IOException { final AtomicLong maxSeqNo = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED); final AtomicLong localCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED);