avl 需要修改Remove返回, 方便操作Iterator

vbt/vbt.go

@@ -112,7 +112,8 @@ func (tree *Tree) IndexRange(idx1, idx2 int) (result []interface{}, ok bool) { /
 		}
 
 		n := tree.indexNode(idx1)
-		iter := NewIterator(n)
+		tree.iter.SetNode(n)
+		iter := tree.iter
 		result = make([]interface{}, 0, idx1-idx2)
 		for i := idx2; i <= idx1; i++ {
 			if iter.Prev() {
@@ -133,7 +134,8 @@ func (tree *Tree) IndexRange(idx1, idx2 int) (result []interface{}, ok bool) { /
 		}
 
 		if n := tree.indexNode(idx1); n != nil {
-			iter := NewIterator(n)
+			tree.iter.SetNode(n)
+			iter := tree.iter
 			result = make([]interface{}, 0, idx2-idx1)
 			for i := idx1; i <= idx2; i++ {
 				if iter.Next() {
@@ -152,13 +154,13 @@ func (tree *Tree) IndexRange(idx1, idx2 int) (result []interface{}, ok bool) { /
 	return nil, false
 }
 
-func (tree *Tree) RemoveIndex(idx int) bool {
+func (tree *Tree) RemoveIndex(idx int) (*Node, bool) {
 	n := tree.indexNode(idx)
 	if n != nil {
 		tree.removeNode(n)
-		return true
+		return n, true
 	}
-	return false
+	return nil, false
 }
 
 func (tree *Tree) removeNode(n *Node) {
@@ -219,14 +221,14 @@ func (tree *Tree) removeNode(n *Node) {
 	return
 }
 
-func (tree *Tree) Remove(key interface{}) bool {
+func (tree *Tree) Remove(key interface{}) (*Node, bool) {
 
 	if n, ok := tree.GetNode(key); ok {
 		tree.removeNode(n)
-		return true
+		return n, true
 	}
 	// return nil
-	return false
+	return nil, false
 }
 
 // Values 返回先序遍历的值
@@ -265,7 +267,6 @@ func (tree *Tree) GetRange(k1, k2 interface{}) (result []interface{}) {
 
 		result = make([]interface{}, 0, 16)
 
-		// iter := NewIterator(min)
 		tree.iter.SetNode(min)
 		iter := tree.iter
 		for iter.Next() {
@@ -292,7 +293,6 @@ func (tree *Tree) GetRange(k1, k2 interface{}) (result []interface{}) {
 
 		result = make([]interface{}, 0, 16)
 
-		// iter := NewIterator(max)
 		tree.iter.SetNode(max)
 		iter := tree.iter
 		for iter.Prev() {
@@ -344,7 +344,6 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 			n = n.children[1]
 			lastc = c
 		case 0:
-			// iter := NewIterator(n)
 			tree.iter.SetNode(n)
 			iter := tree.iter
 			iter.Prev()
@@ -404,8 +403,6 @@ func (tree *Tree) GetNode(value interface{}) (*Node, bool) {
 		case 1:
 			n = n.children[1]
 		case 0:
-			// iter := NewIterator(n)
-
 			tree.iter.SetNode(n)
 			iter := tree.iter
 			iter.Prev()