Skip to content

Commit bfd24f9

Browse files
authored
Remove ImmutableOpenMap from Engine (#88291)
SegmentStats was changed to use Map, but the method in Engine which computes files sizes for segment stats was never converted. This commit removes that final usage from Engine. relates #86239
1 parent a57e645 commit bfd24f9

File tree

1 file changed

+6
-6
lines changed
  • server/src/main/java/org/elasticsearch/index/engine

1 file changed

+6
-6
lines changed

server/src/main/java/org/elasticsearch/index/engine/Engine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.ExceptionsHelper;
2929
import org.elasticsearch.action.index.IndexRequest;
3030
import org.elasticsearch.common.bytes.BytesReference;
31-
import org.elasticsearch.common.collect.ImmutableOpenMap;
3231
import org.elasticsearch.common.logging.Loggers;
3332
import org.elasticsearch.common.lucene.Lucene;
3433
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
@@ -66,6 +65,7 @@
6665
import java.io.IOException;
6766
import java.io.UncheckedIOException;
6867
import java.util.Arrays;
68+
import java.util.Collections;
6969
import java.util.Comparator;
7070
import java.util.HashMap;
7171
import java.util.HashSet;
@@ -843,9 +843,9 @@ protected void fillSegmentStats(SegmentReader segmentReader, boolean includeSegm
843843
}
844844
}
845845

846-
private ImmutableOpenMap<String, SegmentsStats.FileStats> getSegmentFileSizes(SegmentReader segmentReader) {
846+
private Map<String, SegmentsStats.FileStats> getSegmentFileSizes(SegmentReader segmentReader) {
847847
try {
848-
final ImmutableOpenMap.Builder<String, SegmentsStats.FileStats> files = ImmutableOpenMap.builder();
848+
Map<String, SegmentsStats.FileStats> files = new HashMap<>();
849849
final SegmentCommitInfo segmentCommitInfo = segmentReader.getSegmentInfo();
850850
for (String fileName : segmentCommitInfo.files()) {
851851
String fileExtension = IndexFileNames.getExtension(fileName);
@@ -857,11 +857,11 @@ private ImmutableOpenMap<String, SegmentsStats.FileStats> getSegmentFileSizes(Se
857857
logger.warn(() -> "Error when retrieving file length for [" + fileName + "]", ioe);
858858
} catch (AlreadyClosedException ace) {
859859
logger.warn(() -> "Error when retrieving file length for [" + fileName + "], directory is closed", ace);
860-
return ImmutableOpenMap.of();
860+
return Map.of();
861861
}
862862
}
863863
}
864-
return files.build();
864+
return Collections.unmodifiableMap(files);
865865
} catch (IOException e) {
866866
logger.warn(
867867
() -> format(
@@ -871,7 +871,7 @@ private ImmutableOpenMap<String, SegmentsStats.FileStats> getSegmentFileSizes(Se
871871
),
872872
e
873873
);
874-
return ImmutableOpenMap.of();
874+
return Map.of();
875875
}
876876
}
877877

0 commit comments

Comments
 (0)