From: Heng Li <lh3@me.com>
Date: Mon, 18 Jun 2018 02:01:44 +0000 (-0400)
Subject: fixed insert counting err; couting with del
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=31cb0301482a762af0adbfc85dff1632cecc2bb4;p=klib.git

fixed insert counting err; couting with del
---

diff --git a/kavl.h b/kavl.h
index d58bf9d..f3520fd 100644
--- a/kavl.h
+++ b/kavl.h
@@ -85,18 +85,13 @@ int main(void) {
 		while (p != 0) { \
 			int cmp; \
 			cmp = __cmp(x, p); \
+			if (cmp >= 0) cnt += kavl_size_child(__head, p, 0) + 1; \
 			if (cmp < 0) p = p->__head.p[0]; \
-			else if (cmp > 0) { \
-				cnt += kavl_size_child(__head, p, 0) + 1; \
-				p = p->__head.p[1]; \
-			} else { \
-				cnt += kavl_size_child(__head, p, 0) + 1; \
-				if (cnt_) *cnt_ = cnt; \
-				return (__type*)p; \
-			} \
+			else if (cmp > 0) p = p->__head.p[1]; \
+			else break; \
 		} \
 		if (cnt_) *cnt_ = cnt; \
-		return 0; \
+		return (__type*)p; \
 	}
 
 #define __KAVL_ROTATE(suf, __type, __head) \
@@ -144,13 +139,13 @@ int main(void) {
 		for (p = bp, q = bq, top = path_len = 0; p; q = p, p = p->__head.p[which]) { \
 			int cmp; \
 			cmp = __cmp(x, p); \
+			if (cmp >= 0) cnt += kavl_size_child(__head, p, 0) + 1; \
 			if (cmp == 0) { \
-				if (cnt_) *cnt_ = cnt + 1; \
+				if (cnt_) *cnt_ = cnt; \
 				return p; \
 			} \
 			if (p->__head.balance != 0) \
 				bq = q, bp = p, top = 0; \
-			if (cmp > 0) cnt += kavl_size_child(__head, p, 0) + 1; \
 			stack[top++] = which = (cmp > 0); \
 			path[path_len++] = p; \
 		} \
@@ -178,24 +173,32 @@ int main(void) {
 	}
 
 #define __KAVL_ERASE(suf, __scope, __type, __head, __cmp) \
-	__scope __type *kavl_erase_##suf(__type **root_, const __type *x) { \
+	__scope __type *kavl_erase_##suf(__type **root_, const __type *x, unsigned *cnt_) { \
 		__type *p, *path[KAVL_MAX_DEPTH], fake; \
 		unsigned char dir[KAVL_MAX_DEPTH]; \
 		int i, d = 0, cmp; \
+		unsigned cnt = 0; \
 		fake.__head.p[0] = *root_, fake.__head.p[1] = 0; \
+		if (cnt_) *cnt_ = 0; \
 		if (x) { \
 			for (cmp = -1, p = &fake; cmp; cmp = __cmp(x, p)) { \
 				int which = (cmp > 0); \
+				if (cmp > 0) cnt += kavl_size_child(__head, p, 0) + 1; \
 				dir[d] = which; \
 				path[d++] = p; \
 				p = p->__head.p[which]; \
-				if (p == 0) return 0; \
+				if (p == 0) { \
+					if (cnt_) *cnt_ = 0; \
+					return 0; \
+				} \
 			} \
+			cnt += kavl_size_child(__head, p, 0) + 1; /* because p==x is not counted */ \
 		} else { \
-			for (p = &fake; p; p = p->__head.p[0]) \
+			for (p = &fake, cnt = 1; p; p = p->__head.p[0]) \
 				dir[d] = 0, path[d++] = p; \
 			p = path[--d]; \
 		} \
+		if (cnt_) *cnt_ = cnt; \
 		for (i = 1; i < d; ++i) --path[i]->__head.size; \
 		if (p->__head.p[1] == 0) { /* ((1,.)2,3)4 => (1,3)4; p=2 */ \
 			path[d-1]->__head.p[dir[d-1]] = p->__head.p[0]; \
@@ -339,8 +342,8 @@ int main(void) {
  *
  * @return node removed from the tree if present, or NULL if absent
  */
-#define kavl_erase(suf, proot, x) kavl_erase_##suf(proot, x)
-#define kavl_erase_first(suf, proot) kavl_erase_##suf(proot, 0)
+#define kavl_erase(suf, proot, x, cnt) kavl_erase_##suf(proot, x, cnt)
+#define kavl_erase_first(suf, proot) kavl_erase_##suf(proot, 0, 0)
 
 #define kavl_itr_t(suf) struct kavl_itr_##suf
 
diff --git a/test/kavl_test.c b/test/kavl_test.c
index e0a8221..15ce395 100644
--- a/test/kavl_test.c
+++ b/test/kavl_test.c
@@ -88,7 +88,7 @@ int main(void)
 	shuffle(n, buf);
 	for (i = 0; i < n/2; ++i) {
 		t.key = buf[i];
-		q = kavl_erase(my, &root, &t);
+		q = kavl_erase(my, &root, &t, 0);
 		if (q) free(q);
 		check(root, &h);
 	}