From bf8505353a5898ab865a86a74116af885169cbb7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 19 Sep 2019 21:48:14 +0300 Subject: [PATCH] lib/mergeset: rename misleading mergeSmallParts to mergeExistingParts --- lib/mergeset/table.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mergeset/table.go b/lib/mergeset/table.go index 2c2eb1166a..458b09a7e0 100644 --- a/lib/mergeset/table.go +++ b/lib/mergeset/table.go @@ -477,7 +477,7 @@ func (tb *Table) mergeRawItemsBlocks(blocksToMerge []*inmemoryBlock) { } // The added part exceeds maxParts count. Assist with merging other parts. - err := tb.mergeSmallParts(false) + err := tb.mergeExistingParts(false) if err == nil { atomic.AddUint64(&tb.assistedMerges, 1) continue @@ -569,7 +569,7 @@ func (tb *Table) startPartMergers() { } } -func (tb *Table) mergeSmallParts(isFinal bool) error { +func (tb *Table) mergeExistingParts(isFinal bool) error { maxItems := tb.maxOutPartItems() if maxItems > maxItemsPerPart { maxItems = maxItemsPerPart @@ -593,7 +593,7 @@ func (tb *Table) partMerger() error { isFinal := false t := time.NewTimer(sleepTime) for { - err := tb.mergeSmallParts(isFinal) + err := tb.mergeExistingParts(isFinal) if err == nil { // Try merging additional parts. sleepTime = minMergeSleepTime