From 1c709119a931d311b8e948d2a22884b860f2fba0 Mon Sep 17 00:00:00 2001 From: ngaut Date: Wed, 28 Oct 2015 19:15:20 +0800 Subject: [PATCH] compactor: Tiny clean up --- store/localstore/compactor.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/store/localstore/compactor.go b/store/localstore/compactor.go index 5da6814ddc..0d02b0bf0a 100644 --- a/store/localstore/compactor.go +++ b/store/localstore/compactor.go @@ -91,18 +91,16 @@ func (gc *localstoreCompactor) deleteWorker() { case <-gc.stopCh: return case key := <-gc.delCh: - { - cnt++ - batch.Delete(key) - // Batch delete. - if cnt == gc.policy.BatchDeleteCnt { - err := gc.db.Commit(batch) - if err != nil { - log.Error(err) - } - batch = gc.db.NewBatch() - cnt = 0 + cnt++ + batch.Delete(key) + // Batch delete. + if cnt == gc.policy.BatchDeleteCnt { + err := gc.db.Commit(batch) + if err != nil { + log.Error(err) } + batch = gc.db.NewBatch() + cnt = 0 } } } @@ -126,7 +124,6 @@ func (gc *localstoreCompactor) checkExpiredKeysWorker() { gc.recentKeys = make(map[string]struct{}) gc.mu.Unlock() log.Info("GC trigger") - // Do Compactor for k := range m { err := gc.Compact(nil, []byte(k)) if err != nil {