removed old chan

helpers.go

@@ -346,10 +346,8 @@ func (t *Txn[T]) removeChild4(n *Node4[T], c byte) Node[T] {
 	if n.numChildren == 1 {
 		// Is not leaf
 		if t.trackMutate {
-			t.tree.idg.delChns[n.children[0].getOldMutateCh()] = struct{}{}
 			t.tree.idg.delChns[n.children[0].getMutateCh()] = struct{}{}
 			t.tree.idg.delChns[n.getMutateCh()] = struct{}{}
-			t.tree.idg.delChns[n.getOldMutateCh()] = struct{}{}
 		}
 		newChildZero := n.children[0].clone(false, false)
 		if !n.children[0].isLeaf() {

iterator.go

@@ -144,10 +144,11 @@ func (i *Iterator[T]) SeekPrefixWatch(prefixKey []byte) (watch <-chan struct{})
 		return watch
 	}
 
+	i.stack = []Node[T]{node}
+	i.node = node
+
 	for {
 		// Check if the node matches the prefix
-		i.stack = []Node[T]{node}
-		i.node = node
 		watch = node.getMutateCh()
 
 		if node.isLeaf() {
@@ -160,7 +161,6 @@ func (i *Iterator[T]) SeekPrefixWatch(prefixKey []byte) (watch <-chan struct{})
 			mismatchIdx := prefixMismatch[T](node, prefix, len(prefix), depth)
 			if mismatchIdx < int(node.getPartialLen()) {
 				// If there's a mismatch, set the node to nil to break the loop
-				node = nil
 				break
 			}
 			depth += int(node.getPartialLen())
@@ -180,6 +180,9 @@ func (i *Iterator[T]) SeekPrefixWatch(prefixKey []byte) (watch <-chan struct{})
 			break
 		}
 
+		i.stack = []Node[T]{node}
+		i.node = node
+
 		// Move to the next level in the tree
 		node = child
 		depth++

node.go

@@ -33,8 +33,6 @@ type Node[T any] interface {
 	getKeys() []byte
 	getMutateCh() chan struct{}
 	setMutateCh(chan struct{})
-	getOldMutateCh() chan struct{}
-	setOldMutateCh(chan struct{})
 	getLowerBoundCh(byte) int
 
 	Iterator() *Iterator[T]

node_16.go

@@ -17,7 +17,6 @@ type Node16[T any] struct {
 	keys        [16]byte
 	children    [16]Node[T]
 	mutateCh    chan struct{}
-	oldMutateCh chan struct{}
 	refCount    int32
 }
 
@@ -211,11 +210,3 @@ func (n *Node16[T]) createNewMutateChn() chan struct{} {
 	n.setMutateCh(make(chan struct{}))
 	return n.getMutateCh()
 }
-
-func (n *Node16[T]) getOldMutateCh() chan struct{} {
-	return n.oldMutateCh
-}
-
-func (n *Node16[T]) setOldMutateCh(ch chan struct{}) {
-	n.oldMutateCh = ch
-}

node_256.go

@@ -13,7 +13,6 @@ type Node256[T any] struct {
 	children    [256]Node[T]
 	mutateCh    chan struct{}
 	refCount    int32
-	oldMutateCh chan struct{}
 }
 
 func (n *Node256[T]) getId() uint64 {
@@ -203,11 +202,3 @@ func (n *Node256[T]) createNewMutateChn() chan struct{} {
 	n.setMutateCh(make(chan struct{}))
 	return n.getMutateCh()
 }
-
-func (n *Node256[T]) getOldMutateCh() chan struct{} {
-	return n.oldMutateCh
-}
-
-func (n *Node256[T]) setOldMutateCh(ch chan struct{}) {
-	n.oldMutateCh = ch
-}

node_4.go

@@ -18,7 +18,6 @@ type Node4[T any] struct {
 	children    [4]Node[T]
 	mutateCh    chan struct{}
 	refCount    int32
-	oldMutateCh chan struct{}
 }
 
 func (n *Node4[T]) getId() uint64 {
@@ -211,11 +210,3 @@ func (n *Node4[T]) createNewMutateChn() chan struct{} {
 	n.setMutateCh(make(chan struct{}))
 	return n.getMutateCh()
 }
-
-func (n *Node4[T]) getOldMutateCh() chan struct{} {
-	return n.oldMutateCh
-}
-
-func (n *Node4[T]) setOldMutateCh(ch chan struct{}) {
-	n.oldMutateCh = ch
-}

node_48.go

@@ -18,7 +18,6 @@ type Node48[T any] struct {
 	children    [48]Node[T]
 	refCount    int32
 	mutateCh    chan struct{}
-	oldMutateCh chan struct{}
 }
 
 func (n *Node48[T]) getId() uint64 {
@@ -215,11 +214,3 @@ func (n *Node48[T]) createNewMutateChn() chan struct{} {
 	n.setMutateCh(make(chan struct{}))
 	return n.getMutateCh()
 }
-
-func (n *Node48[T]) getOldMutateCh() chan struct{} {
-	return n.oldMutateCh
-}
-
-func (n *Node48[T]) setOldMutateCh(ch chan struct{}) {
-	n.oldMutateCh = ch
-}

node_leaf.go

@@ -9,12 +9,11 @@ import (
 )
 
 type NodeLeaf[T any] struct {
-	id          uint64
-	value       T
-	key         []byte
-	mutateCh    chan struct{}
-	refCount    int32
-	oldMutateCh chan struct{}
+	id       uint64
+	value    T
+	key      []byte
+	mutateCh chan struct{}
+	refCount int32
 }
 
 func (n *NodeLeaf[T]) getId() uint64 {
@@ -197,11 +196,3 @@ func (n *NodeLeaf[T]) createNewMutateChn() chan struct{} {
 	n.setMutateCh(make(chan struct{}))
 	return n.getMutateCh()
 }
-
-func (n *NodeLeaf[T]) getOldMutateCh() chan struct{} {
-	return n.oldMutateCh
-}
-
-func (n *NodeLeaf[T]) setOldMutateCh(ch chan struct{}) {
-	n.oldMutateCh = ch
-}