fixup remove

apple · Apr 23, 2020 · 675eb75 · 675eb75
1 parent ee8eb8f
commit 675eb75
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/fdbclient/VersionedMap.h b/fdbclient/VersionedMap.h
@@ -344,12 +344,16 @@ namespace PTreeImpl {
 	void remove(Reference<PTree<T>>& p, Version at, const X& x) {
 		if (!p) ASSERT(false); // attempt to remove item not present in PTree
 		comparison cmp = compare(x, p->data);
-		if (cmp == 0) {
-			removeRoot(p, at);
-		} else {
-			Reference<PTree<T>> child = p->child(cmp > 0, at);
+		if (cmp < 0) {
+			Reference<PTree<T>> child = p->child(0, at);
+			remove(child, at, x);
+			p = update(p, 0, child, at);
+		} else if (cmp > 0) {
+			Reference<PTree<T>> child = p->child(1, at);
 			remove(child, at, x);
-			p = update(p, cmp > 0, child, at);
+			p = update(p, 1, child, at);
+		} else {
+			removeRoot(p, at);
 		}
 	}