Skip to content

Commit

Permalink
Merge pull request #9300 from xiang90/simple
Browse files Browse the repository at this point in the history
mvcc: remove unnecessary metrics update code
  • Loading branch information
xiang90 authored Feb 8, 2018
2 parents b309bc6 + 1a3a4d1 commit fe94f8f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
10 changes: 1 addition & 9 deletions internal/mvcc/backend/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 0 additions & 11 deletions internal/mvcc/backend/batch_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit fe94f8f

Please sign in to comment.