.

all_test.go

@@ -223,13 +223,13 @@ func TestSetGet0(t *testing.T) {
 }
 
 func TestSetGet1(t *testing.T) {
-	//const N = 40000
+	const N = 40000
 	//const N = 21
 	//const N = 41
 	//const N = 320
-	const N = 730
-	//for _, x := range []int{0, -1, 0x555555, 0xaaaaaa, 0x333333, 0xcccccc, 0x314159} {
-	for _, x := range []int{0x333333} {
+	//const N = 730
+	for _, x := range []int{0, -1, 0x555555, 0xaaaaaa, 0x333333, 0xcccccc, 0x314159} {
+	//for _, x := range []int{0x333333} {
 	//for _, x := range []int{0x314159} {
 	//for _, x := range []int{0} {
 		r := TreeNew(cmp)

btree.go

@@ -655,7 +655,7 @@ func (t *Tree) SeekLast() (e *Enumerator, err error) {
 
 // Set sets the value associated with k.
 func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
-	dbg("--- PRE Set(%v, %v)\t(%v @%d, [%v, %v)  PKmax: %v)\n%s", k, v, t.hitD, t.hitDi, t.hitKmin, t.hitKmax, t.hitPKmax, t.dump())
+	//dbg("--- PRE Set(%v, %v)\t(%v @%d, [%v, %v)  PKmax: %v)\n%s", k, v, t.hitD, t.hitDi, t.hitKmin, t.hitKmax, t.hitPKmax, t.dump())
 	defer func() {
 		badHappenned := false
 		bad := func(s string, va ...interface{}) {
@@ -663,7 +663,7 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 			badHappenned = true
 		}
 
-		println()
+		//println()
 
 		if t.hitDi >= 0 {
 			if t.hitD.d[t.hitDi].k != k {
@@ -767,9 +767,9 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 		}
 
 	}()
-	defer func() {
-		dbg("--- POST\n%s\n====\n", t.dump())
-	}()
+	//defer func() {
+	//	dbg("--- POST\n%s\n====\n", t.dump())
+	//}()
 
 
 	// check if we can do the update nearby previous change
@@ -780,13 +780,13 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 
 		switch {
 		case ok:
-			dbg("ok'")
+			//dbg("ok'")
 			dd.d[i].v = v
 			t.hitDi = i
 			return
 
 		case dd.c < 2*kd:
-			dbg("insert'")
+			//dbg("insert'")
 			t.insert(dd, i, k, v)
 			return
 
@@ -797,7 +797,7 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 			//break
 			p, pi := t.hitP, t.hitPi
 			if p == nil || p.c <= 2*kx {	// XXX < vs <=
-				dbg("overflow'")
+				//dbg("overflow'")
 				t.overflow(p, dd, pi, i, k, v)
 				return
 			}
@@ -809,7 +809,7 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 	var p *x
 	q := t.r
 	if q == nil {
-		dbg("empty")
+		//dbg("empty")
 		z := t.insert(btDPool.Get().(*d), 0, k, v) // XXX update hit
 		t.r, t.first, t.last = z, z, z
 		return
@@ -826,18 +826,18 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 
 			if x.c > 2*kx {
 				//x, i = t.splitX(p, x, pi, i)
-				dbg("splitX")
+				//dbg("splitX")
 				x, i, p, pi = t.splitX(p, x, pi, i)
 
 				// NOTE splitX changes p
 				if pi >= 0 && pi < p.c {
 					hitPKmax.set(p.x[pi].k)
-					dbg("hitPKmax X: %v", hitPKmax)
+					//dbg("hitPKmax X: %v", hitPKmax)
 				}
 
 				if pi > 0 {
 					hitKmin.set(p.x[pi-1].k)
-					dbg("hitKmin X: %v", hitKmin)
+					//dbg("hitKmin X: %v", hitKmin)
 				}
 			} else {
 				// p unchanged
@@ -854,12 +854,12 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 
 			if pi > 0 {	// XXX also check < p.c ?
 				hitKmin.set(p.x[pi-1].k)
-				dbg("hitKmin: %v", hitKmin)
+				//dbg("hitKmin: %v", hitKmin)
 			}
 
 			if pi < p.c {
 				hitKmax.set(p.x[pi].k)
-				dbg("hitKmax: %v", hitKmax)
+				//dbg("hitKmax: %v", hitKmax)
 			}
 
 
@@ -873,16 +873,16 @@ func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
 
 			switch {
 			case ok:
-				dbg("ok")
+				//dbg("ok")
 				x.d[i].v = v
 				t.hitD, t.hitDi = x, i
 
 			case x.c < 2*kd:
-				dbg("insert")
+				//dbg("insert")
 				t.insert(x, i, k, v)
 
 			default:
-				dbg("overflow")
+				//dbg("overflow")
 				// NOTE overflow will correct hit Kmin, Kmax, P and Pi as needed
 				t.overflow(p, x, pi, i, k, v)
 			}