准备修改benmark test的一些方式, 达到最佳

avlkey/avlkey.go

@@ -28,10 +28,12 @@ type Tree struct {
 	root    *Node
 	size    int
 	Compare compare.Compare
+
+	iter *Iterator
 }
 
 func New(Compare compare.Compare) *Tree {
-	return &Tree{Compare: Compare}
+	return &Tree{Compare: Compare, iter: NewIteratorWithCap(nil, 16)}
 }
 
 func (tree *Tree) String() string {
@@ -52,14 +54,14 @@ func (tree *Tree) Size() int {
 	return tree.size
 }
 
-func (tree *Tree) Remove(key interface{}) *Node {
+func (tree *Tree) Remove(key interface{}) (interface{}, bool) {
 
 	if n, ok := tree.GetNode(key); ok {
 
 		tree.size--
 		if tree.size == 0 {
 			tree.root = nil
-			return n
+			return n.value, true
 		}
 
 		left := getHeight(n.children[0])
@@ -69,7 +71,7 @@ func (tree *Tree) Remove(key interface{}) *Node {
 			p := n.parent
 			p.children[getRelationship(n)] = nil
 			tree.fixRemoveHeight(p)
-			return n
+			return n.value, true
 		}
 
 		var cur *Node
@@ -110,10 +112,10 @@ func (tree *Tree) Remove(key interface{}) *Node {
 			tree.fixRemoveHeight(cparent)
 		}
 
-		return cur
+		return cur.value, true
 	}
 
-	return nil
+	return nil, false
 }
 
 // Values 返回先序遍历的值
@@ -152,7 +154,8 @@ 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() {
 			result = append(result, iter.Value())
 			if iter.cur == max {
@@ -177,7 +180,8 @@ 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() {
 			result = append(result, iter.Value())
 			if iter.cur == min {
@@ -227,7 +231,9 @@ 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()
 			for iter.Prev() {
 				if tree.Compare(iter.cur.value, n.value) == 0 {
@@ -248,21 +254,21 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 
 		if result[1] != nil {
 
-			result[0] = GetPrev(result[1], 1)
-			result[2] = GetNext(result[1], 1)
+			result[0] = tree.iter.GetPrev(result[1], 1)
+			result[2] = tree.iter.GetNext(result[1], 1)
 		} else {
 			result[0] = last
-			result[2] = GetNext(last, 1)
+			result[2] = tree.iter.GetNext(last, 1)
 		}
 
 	case -1:
 
 		if result[1] != nil {
-			result[0] = GetPrev(result[1], 1)
-			result[2] = GetNext(result[1], 1)
+			result[0] = tree.iter.GetPrev(result[1], 1)
+			result[2] = tree.iter.GetNext(result[1], 1)
 		} else {
 			result[2] = last
-			result[0] = GetPrev(last, 1)
+			result[0] = tree.iter.GetPrev(last, 1)
 		}
 
 	case 0:
@@ -270,8 +276,8 @@ func (tree *Tree) getArountNode(key interface{}) (result [3]*Node) {
 		if result[1] == nil {
 			return
 		}
-		result[0] = GetPrev(result[1], 1)
-		result[2] = GetNext(result[1], 1)
+		result[0] = tree.iter.GetPrev(result[1], 1)
+		result[2] = tree.iter.GetNext(result[1], 1)
 	}
 	return
 }
@@ -285,7 +291,8 @@ func (tree *Tree) GetNode(key interface{}) (*Node, bool) {
 		case 1:
 			n = n.children[1]
 		case 0:
-			iter := NewIterator(n)
+			tree.iter.SetNode(n)
+			iter := tree.iter
 			iter.Prev()
 			for iter.Prev() {
 				if tree.Compare(iter.cur.key, n.key) == 0 {

avlkey/avlkey_test.go

@@ -16,36 +16,6 @@ import (
 	"github.com/emirpasic/gods/utils"
 )
 
-const CompartorSize = 100
-const NumberMax = 600
-
-func Save(t *testing.T) {
-
-	f, err := os.OpenFile("../l.log", os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
-	if err != nil {
-		log.Println(err)
-	}
-
-	//fmt.Println(userBytes)
-
-	var l []int
-	// m := make(map[int]int)
-	for i := 0; len(l) < CompartorSize; i++ {
-		v := randomdata.Number(0, NumberMax)
-		// if _, ok := m[v]; !ok {
-		// 	m[v] = v
-		l = append(l, v)
-		// }
-	}
-
-	var result bytes.Buffer
-	encoder := gob.NewEncoder(&result)
-	encoder.Encode(l)
-	lbytes := result.Bytes()
-	f.Write(lbytes)
-
-}
-
 func loadTestData() []int {
 	data, err := ioutil.ReadFile("../l.log")
 	if err != nil {

avlkey/iterator.go

@@ -24,6 +24,18 @@ func NewIterator(n *Node) *Iterator {
 	return iter
 }
 
+func NewIteratorWithCap(n *Node, cap int) *Iterator {
+	iter := &Iterator{tstack: lastack.NewWithCap(cap)}
+	iter.up = n
+	return iter
+}
+
+func (iter *Iterator) SetNode(n *Node) {
+	iter.up = n
+	iter.dir = 0
+	iter.tstack.Clear()
+}
+
 func (iter *Iterator) Value() interface{} {
 	return iter.cur.value
 }
@@ -46,9 +58,10 @@ func (iter *Iterator) Right() bool {
 	return false
 }
 
-func GetNext(cur *Node, idx int) *Node {
+func (iter *Iterator) GetNext(cur *Node, idx int) *Node {
 
-	iter := NewIterator(cur)
+	// iter := NewIterator(cur)
+	iter.SetNode(cur)
 	iter.curPushNextStack(iter.up)
 	iter.up = iter.getNextUp(iter.up)
 
@@ -103,9 +116,10 @@ func (iter *Iterator) Next() (result bool) {
 
 	return false
 }
-func GetPrev(cur *Node, idx int) *Node {
+func (iter *Iterator) GetPrev(cur *Node, idx int) *Node {
 
-	iter := NewIterator(cur)
+	// iter := NewIterator(cur)
+	iter.SetNode(cur)
 	iter.curPushPrevStack(iter.up)
 	iter.up = iter.getPrevUp(iter.up)