Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,27 @@ func TestDB_Revision(t *testing.T) {
require.Equal(t, writeRevision, startRevision+1, "revision incremented on Insert")
readRevision = table.Revision(db.ReadTxn())
require.Equal(t, writeRevision, readRevision, "committed transaction changed revision")

// Committed no-op deletes do not increment the revision.
txn = db.WriteTxn(table)
_, hadOld, err := table.Delete(txn, &testObject{ID: 2})
require.NoError(t, err)
require.False(t, hadOld)
writeRevision = table.Revision(txn)
txn.Commit()
require.Equal(t, readRevision, writeRevision, "missing Delete did not increment revision")
readRevision = table.Revision(db.ReadTxn())
require.Equal(t, readRevision, readRevision, "committed missing Delete did not change revision")

// Committed deletes of existing objects increment the revision.
txn = db.WriteTxn(table)
_, hadOld, err = table.Delete(txn, &testObject{ID: 1})
require.NoError(t, err)
require.True(t, hadOld)
writeRevision = table.Revision(txn)
txn.Commit()
require.Equal(t, readRevision+1, writeRevision, "revision incremented on Delete")
require.Equal(t, writeRevision, table.Revision(db.ReadTxn()), "committed found Delete changed revision")
}

func TestDB_GetList(t *testing.T) {
Expand Down
9 changes: 4 additions & 5 deletions write_txn.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,12 @@ func (txn *writeTxnState) delete(meta TableMeta, guardRevision Revision, data an
return object{}, false, ErrTransactionClosed
}

// Look up table and allocate a new revision.
// Look up table.
tableName := meta.Name()
table := txn.tableEntries[meta.tablePos()]
if !table.locked {
return object{}, false, tableError(tableName, ErrTableNotLockedForWriting)
}
oldRevision := table.revision
table.revision++
revision := table.revision

// Delete from the primary index first to grab the object.
// We assume that "data" has only enough defined fields to
Expand All @@ -260,11 +257,13 @@ func (txn *writeTxnState) delete(meta TableMeta, guardRevision Revision, data an
if guardRevision > 0 {
if obj.revision != guardRevision {
idIndex.insert(idKey, obj)
table.revision = oldRevision
return obj, true, ErrRevisionNotEqual
}
}

table.revision++
revision := table.revision

// Remove the object from the revision index.
binary.BigEndian.PutUint64(txn.revKey[:], obj.revision)
txn.mustIndexWriteTxn(meta, RevisionIndexPos).delete(txn.revKey[:])
Expand Down
Loading