From 73ed8e248d340ceb2ca3380f2f91bc1fd316576b Mon Sep 17 00:00:00 2001 From: Sreekanth Sivasankaran Date: Wed, 7 Mar 2018 18:34:54 +0530 Subject: [PATCH] fixing the indentation issues. looks like it happened during the web based conflict resolution.. --- index/scorch/merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index/scorch/merge.go b/index/scorch/merge.go index 89d6ec14..2b0e734c 100644 --- a/index/scorch/merge.go +++ b/index/scorch/merge.go @@ -185,7 +185,7 @@ func (s *Scorch) planMergeAtSnapshot(ourSnapshot *IndexSnapshot, atomic.AddUint64(&s.stats.TotFileMergeZapBeg, 1) newDocNums, nBytes, err := zap.Merge(segmentsToMerge, docsToDrop, path, 1024) atomic.AddUint64(&s.stats.TotFileMergeZapEnd, 1) - atomic.AddUint64(&s.stats.TotFileMergeWrittenBytes, nBytes) + atomic.AddUint64(&s.stats.TotFileMergeWrittenBytes, nBytes) fileMergeZapTime := uint64(time.Since(fileMergeZapStartTime)) atomic.AddUint64(&s.stats.TotFileMergeZapTime, fileMergeZapTime) @@ -193,7 +193,7 @@ func (s *Scorch) planMergeAtSnapshot(ourSnapshot *IndexSnapshot, atomic.StoreUint64(&s.stats.MaxFileMergeZapTime, fileMergeZapTime) } - if err != nil { + if err != nil { s.unmarkIneligibleForRemoval(filename) atomic.AddUint64(&s.stats.TotFileMergePlanTasksErr, 1) return fmt.Errorf("merging failed: %v", err)