fix tests

hashicorp · May 21, 2024 · 8cf6207 · 8cf6207
1 parent f767704
commit 8cf6207
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -4,6 +4,6 @@ go 1.21
 
 toolchain go1.22.2
 
-require github.com/absolutelightning/go-immutable-adaptive-radix v1.0.10
+require github.com/absolutelightning/go-immutable-adaptive-radix v1.0.11
 
 require github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/absolutelightning/go-immutable-adaptive-radix v1.0.10 h1:/TEeOgR2I8XNxogniqcr6n9679FKMfyrPJ0Bn5xwgcc=
-github.com/absolutelightning/go-immutable-adaptive-radix v1.0.10/go.mod h1:mnTsE7jTX4QguPvFwr9Ih787akkQzPGpdtUlg5PJ4K4=
+github.com/absolutelightning/go-immutable-adaptive-radix v1.0.11 h1:Pw3M6yzC7McSRm1CUNacz9AcgI67Dq1m1QokrJXrH/s=
+github.com/absolutelightning/go-immutable-adaptive-radix v1.0.11/go.mod h1:mnTsE7jTX4QguPvFwr9Ih787akkQzPGpdtUlg5PJ4K4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=

diff --git a/integ_test.go b/integ_test.go
@@ -284,9 +284,7 @@ func TestComplexDB(t *testing.T) {
 	}
 }
 
-// TODO Revisit
 func TestWatchUpdate(t *testing.T) {
-	t.Skip()
 	db := testComplexDB(t)
 	testPopulateData(t, db)
 	txn := db.Txn(false) // read only

diff --git a/memdb.go b/memdb.go
@@ -63,8 +63,11 @@ func (db *MemDB) DBSchema() *DBSchema {
 }
 
 // getRoot is used to do an atomic load of the root pointer
-func (db *MemDB) getRoot() *adaptive.RadixTree[any] {
+func (db *MemDB) getRoot(clone bool) *adaptive.RadixTree[any] {
 	root := (*adaptive.RadixTree[any])(atomic.LoadPointer(&db.root))
+	if clone {
+		return root.Clone(true)
+	}
 	return root
 }
 
@@ -77,7 +80,7 @@ func (db *MemDB) Txn(write bool) *Txn {
 	txn := &Txn{
 		db:      db,
 		write:   write,
-		rootTxn: db.getRoot().Txn(),
+		rootTxn: db.getRoot(false).Txn(),
 	}
 	return txn
 }
@@ -91,7 +94,7 @@ func (db *MemDB) Txn(write bool) *Txn {
 func (db *MemDB) Snapshot() *MemDB {
 	clone := &MemDB{
 		schema:  db.schema,
-		root:    unsafe.Pointer(db.getRoot()),
+		root:    unsafe.Pointer(db.getRoot(true)),
 		primary: false,
 	}
 	return clone
@@ -100,7 +103,7 @@ func (db *MemDB) Snapshot() *MemDB {
 // initialize is used to setup the DB for use after creation. This should
 // be called only once after allocating a MemDB.
 func (db *MemDB) initialize() error {
-	root := db.getRoot()
+	root := db.getRoot(false)
 	for tName, tableSchema := range db.schema.Tables {
 		for iName := range tableSchema.Indexes {
 			index := adaptive.NewRadixTree[any]()