Skip to content

Commit 43c8507

Browse files
committed
Add docs, small fixes
1 parent ce66ca2 commit 43c8507

File tree

3 files changed

+11
-63
lines changed

3 files changed

+11
-63
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,7 @@ public synchronized void beforeMerge(OnGoingMerge merge) {
28502850
@Override
28512851
protected long estimateMergeMemory(MergePolicy.OneMerge merge) {
28522852
try (Searcher searcher = acquireSearcher("merge_memory_estimation", SearcherScope.INTERNAL)) {
2853-
return SegmentMergeMemoryEstimator.estimateMergeMemory(merge, searcher.getIndexReader());
2853+
return MergeMemoryEstimator.estimateMergeMemory(merge, searcher.getIndexReader());
28542854
} catch (AlreadyClosedException e) {
28552855
failOnTragicEvent(e);
28562856
return 0L;
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@
2323

2424
import java.util.List;
2525

26-
public class SegmentMergeMemoryEstimator {
26+
/**
27+
* Provides an estimation of the memory needed to merge segments.
28+
*
29+
* This class is a temporary solution until we have a better way to estimate the memory needed for merges in Lucene.
30+
* We can work iteratively in providing estimations for different types of fields and vector encodings.
31+
*/
32+
public class MergeMemoryEstimator {
2733

34+
/**
35+
* Estimates the memory, in bytes, needed to merge the segments of the given merge.
36+
*/
2837
public static long estimateMergeMemory(MergePolicy.OneMerge merge, IndexReader indexReader) {
2938
long memoryNeeded = 0;
3039
for (SegmentCommitInfo mergedSegment : merge.segments) {

server/src/test/java/org/elasticsearch/index/engine/MemoryEstimationMergeTests.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)