status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Rename db

Browse Source
This commit is contained in:
Daniel Nephin 2020-06-03 12:59:10 -04:00
parent deef6fcc32
commit 32aa3ada35
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agent/consul/state/memdb_wrapper.go
View File

@ -4,12 +4,12 @@ import (
"github.com/hashicorp/go-memdb" "github.com/hashicorp/go-memdb"
) )
// memDBWrapper is a thin wrapper around memdb.DB which enables TrackChanges on // changeTrackerDB is a thin wrapper around memdb.DB which enables TrackChanges on
// all write transactions. When the transaction is committed the changes are // all write transactions. When the transaction is committed the changes are
// sent to the eventPublisher which will create and emit change events. // sent to the eventPublisher which will create and emit change events.
type memDBWrapper struct { type changeTrackerDB struct {
db *memdb.MemDB db *memdb.MemDB
// TODO: add publisher // TODO(streaming): add publisher
} }
// Txn exists to maintain backwards compatibility with memdb.DB.Txn. Preexisting // Txn exists to maintain backwards compatibility with memdb.DB.Txn. Preexisting
@ -17,7 +17,7 @@ type memDBWrapper struct {
// with write=true. // with write=true.
// //
// Deprecated: use either ReadTxn, or WriteTxn. // Deprecated: use either ReadTxn, or WriteTxn.
func (db *memDBWrapper) Txn(write bool) *txnWrapper { func (db *changeTrackerDB) Txn(write bool) *txnWrapper {
if write { if write {
panic("don't use db.Txn(true), use db.WriteTxn(idx uin64)") panic("don't use db.Txn(true), use db.WriteTxn(idx uin64)")
} }
@ -26,7 +26,7 @@ func (db *memDBWrapper) Txn(write bool) *txnWrapper {
// ReadTxn returns a read-only transaction which behaves exactly the same as // ReadTxn returns a read-only transaction which behaves exactly the same as
// memdb.Txn // memdb.Txn
func (db *memDBWrapper) ReadTxn() *txnWrapper { func (db *changeTrackerDB) ReadTxn() *txnWrapper {
return &txnWrapper{Txn: db.db.Txn(false)} return &txnWrapper{Txn: db.db.Txn(false)}
} }
@ -40,7 +40,7 @@ func (db *memDBWrapper) ReadTxn() *txnWrapper {
// The exceptional cases are transactions that are executed on an empty // The exceptional cases are transactions that are executed on an empty
// memdb.DB as part of Restore, and those executed by tests where we insert // memdb.DB as part of Restore, and those executed by tests where we insert
// data directly into the DB. These cases may use WriteTxnRestore. // data directly into the DB. These cases may use WriteTxnRestore.
func (db *memDBWrapper) WriteTxn(idx uint64) *txnWrapper { func (db *changeTrackerDB) WriteTxn(idx uint64) *txnWrapper {
t := &txnWrapper{ t := &txnWrapper{
Txn: db.db.Txn(true), Txn: db.db.Txn(true),
Index: idx, Index: idx,
@ -55,7 +55,7 @@ func (db *memDBWrapper) WriteTxn(idx uint64) *txnWrapper {
// WriteTxnRestore uses a zero index since the whole restore doesn't really occur // WriteTxnRestore uses a zero index since the whole restore doesn't really occur
// at one index - the effect is to write many values that were previously // at one index - the effect is to write many values that were previously
// written across many indexes. // written across many indexes.
func (db *memDBWrapper) WriteTxnRestore() *txnWrapper { func (db *changeTrackerDB) WriteTxnRestore() *txnWrapper {
t := &txnWrapper{ t := &txnWrapper{
Txn: db.db.Txn(true), Txn: db.db.Txn(true),
Index: 0, Index: 0,

4
agent/consul/state/state_store.go
View File

@ -98,7 +98,7 @@ const (
// from the Raft log through the FSM. // from the Raft log through the FSM.
type Store struct { type Store struct {
schema *memdb.DBSchema schema *memdb.DBSchema
db *memDBWrapper db *changeTrackerDB
// abandonCh is used to signal watchers that this state store has been // abandonCh is used to signal watchers that this state store has been
// abandoned (usually during a restore). This is only ever closed. // abandoned (usually during a restore). This is only ever closed.
@ -160,7 +160,7 @@ func NewStateStore(gc *TombstoneGC) (*Store, error) {
kvsGraveyard: NewGraveyard(gc), kvsGraveyard: NewGraveyard(gc),
lockDelay: NewDelay(), lockDelay: NewDelay(),
} }
s.db = &memDBWrapper{ s.db = &changeTrackerDB{
db: db, db: db,
} }
return s, nil return s, nil