diff options
Diffstat (limited to 'tx.go')
| -rw-r--r-- | tx.go | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -157,7 +157,7 @@ func (tx *Tx) Commit() error { // spill data onto dirty pages. startTime = time.Now() if err := tx.root.spill(); err != nil { - tx.close() + tx.rollback() return err } tx.stats.SpillTime += time.Since(startTime) @@ -170,16 +170,19 @@ func (tx *Tx) Commit() error { tx.db.freelist.free(tx.id(), tx.db.page(tx.meta.freelist)) p, err := tx.allocate((tx.db.freelist.size() / tx.db.pageSize) + 1) if err != nil { - tx.close() + tx.rollback() + return err + } + if err := tx.db.freelist.write(p); err != nil { + tx.rollback() return err } - tx.db.freelist.write(p) tx.meta.freelist = p.id // Write dirty pages to disk. startTime = time.Now() if err := tx.write(); err != nil { - tx.close() + tx.rollback() return err } @@ -193,7 +196,7 @@ func (tx *Tx) Commit() error { // Write meta to disk. if err := tx.writeMeta(); err != nil { - tx.close() + tx.rollback() return err } tx.stats.WriteTime += time.Since(startTime) @@ -215,10 +218,18 @@ func (tx *Tx) Rollback() error { if tx.db == nil { return ErrTxClosed } - tx.close() + tx.rollback() return nil } +func (tx *Tx) rollback() { + if tx.writable { + tx.db.freelist.rollback(tx.id()) + tx.db.freelist.reload(tx.db.page(tx.db.meta().freelist)) + } + tx.close() +} + func (tx *Tx) close() { if tx.writable { // Remove writer lock. |