From 1a3a4d16460415e1baf1ea5a1ac047534400e58f Mon Sep 17 00:00:00 2001 From: Xiang Date: Wed, 7 Feb 2018 23:26:12 -0800 Subject: [PATCH] mvcc: remove unncessary metrics update code --- internal/mvcc/backend/backend.go | 10 +--------- internal/mvcc/backend/batch_tx.go | 11 ----------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/internal/mvcc/backend/backend.go b/internal/mvcc/backend/backend.go index cde61cd1aa4..5fc126167b9 100644 --- a/internal/mvcc/backend/backend.go +++ b/internal/mvcc/backend/backend.go @@ -288,15 +288,7 @@ func (b *backend) Commits() int64 { } func (b *backend) Defrag() error { - err := b.defrag() - if err != nil { - return err - } - - // commit to update metadata like db.size - b.batchTx.Commit() - - return nil + return b.defrag() } func (b *backend) defrag() error { diff --git a/internal/mvcc/backend/batch_tx.go b/internal/mvcc/backend/batch_tx.go index e7307bdca13..7bb5f8d4a05 100644 --- a/internal/mvcc/backend/batch_tx.go +++ b/internal/mvcc/backend/batch_tx.go @@ -158,17 +158,6 @@ func (t *batchTx) commit(stop bool) { // commit the last tx if t.tx != nil { if t.pending == 0 && !stop { - t.backend.mu.RLock() - defer t.backend.mu.RUnlock() - - // t.tx.DB()==nil if 'CommitAndStop' calls 'batchTx.commit(true)', - // which initializes *bolt.Tx.db and *bolt.Tx.meta as nil; panics t.tx.Size(). - // Server must make sure 'batchTx.commit(false)' does not follow - // 'batchTx.commit(true)' (e.g. stopping backend, and inflight Hash call). - size := t.tx.Size() - db := t.tx.DB() - atomic.StoreInt64(&t.backend.size, size) - atomic.StoreInt64(&t.backend.sizeInUse, size-(int64(db.Stats().FreePageN)*int64(db.Info().PageSize))) return }