Skip to content
Permalink
Browse files

Merge pull request #3703 from xiang90/bolt

storage/backend: avoid creating new bolt.tx during a batchTx
  • Loading branch information...
xiang90 committed Oct 19, 2015
2 parents 79c263b + 5efdd7b commit 776e9fb7be7eee5e6b58ab977c8887b4fe4d48db
Showing with 8 additions and 8 deletions.
  1. +8 −8 storage/backend/batch_tx.go
@@ -64,10 +64,6 @@ func (t *batchTx) UnsafePut(bucketName []byte, key []byte, value []byte) {
log.Fatalf("storage: cannot put key into bucket (%v)", err)
}
t.pending++
if t.pending >= t.backend.batchLimit {
t.commit(false)
t.pending = 0
}
}

// before calling unsafeRange, the caller MUST hold the lock on tx.
@@ -108,10 +104,6 @@ func (t *batchTx) UnsafeDelete(bucketName []byte, key []byte) {
log.Fatalf("storage: cannot delete key from bucket (%v)", err)
}
t.pending++
if t.pending >= t.backend.batchLimit {
t.commit(false)
t.pending = 0
}
}

// Commit commits a previous tx and begins a new writable one.
@@ -128,6 +120,14 @@ func (t *batchTx) CommitAndStop() {
t.commit(true)
}

func (t *batchTx) Unlock() {
if t.pending >= t.backend.batchLimit {
t.commit(false)
t.pending = 0
}
t.Mutex.Unlock()
}

func (t *batchTx) commit(stop bool) {
var err error
// commit the last tx

0 comments on commit 776e9fb

Please sign in to comment.
You can’t perform that action at this time.