X-Git-Url: https://pd.if.org/git/?p=btree;a=blobdiff_plain;f=threadskv6.c;h=9350ca5040fb5511f0a8da5e18a05e8b017faf58;hp=627a3786570d02b2833cd8f438a82f65b3d6257d;hb=392e5f08cc164c87e56153aa78a740f93325750e;hpb=7c7d7742df4cf61722cd87e2001f8dd5013b7960

diff --git a/threadskv6.c b/threadskv6.c
index 627a378..9350ca5 100644
--- a/threadskv6.c
+++ b/threadskv6.c
@@ -1750,7 +1750,9 @@ BtVal *val;
 	while( cnt++ < max ) {
 		if( cnt == slot )
 			newslot = idx + 2;
-		if( cnt < max && slotptr(bt->frame,cnt)->dead )
+
+		if( cnt < max || page->lvl )
+		 if( slotptr(bt->frame,cnt)->dead )
 			continue;
 
 		// copy the value across
@@ -1767,11 +1769,9 @@ BtVal *val;
 
 		// make a librarian slot
 
-		if( idx ) {
-			slotptr(page, ++idx)->off = nxt;
-			slotptr(page, idx)->type = Librarian;
-			slotptr(page, idx)->dead = 1;
-		}
+		slotptr(page, ++idx)->off = nxt;
+		slotptr(page, idx)->type = Librarian;
+		slotptr(page, idx)->dead = 1;
 
 		// set up the slot
 
@@ -1885,8 +1885,10 @@ uint prev;
 	idx = 0;
 
 	while( cnt++ < max ) {
-		if( slotptr(set->page, cnt)->dead && cnt < max )
+		if( cnt < max || set->page->lvl )
+		  if( slotptr(set->page, cnt)->dead )
 			continue;
+
 		src = valptr(set->page, cnt);
 		nxt -= src->len + sizeof(BtVal);
 		memcpy ((unsigned char *)bt->frame + nxt, src, src->len + sizeof(BtVal));
@@ -1898,11 +1900,9 @@ uint prev;
 
 		//	add librarian slot
 
-		if( idx ) {
-			slotptr(bt->frame, ++idx)->off = nxt;
-			slotptr(bt->frame, idx)->type = Librarian;
-			slotptr(bt->frame, idx)->dead = 1;
-		}
+		slotptr(bt->frame, ++idx)->off = nxt;
+		slotptr(bt->frame, idx)->type = Librarian;
+		slotptr(bt->frame, idx)->dead = 1;
 
 		//  add actual slot
 
@@ -1971,11 +1971,9 @@ uint prev;
 
 		//	add librarian slot
 
-		if( idx ) {
-			slotptr(set->page, ++idx)->off = nxt;
-			slotptr(set->page, idx)->type = Librarian;
-			slotptr(set->page, idx)->dead = 1;
-		}
+		slotptr(set->page, ++idx)->off = nxt;
+		slotptr(set->page, idx)->type = Librarian;
+		slotptr(set->page, idx)->dead = 1;
 
 		//	add actual slot
 
@@ -2006,16 +2004,18 @@ uint prev;
 
 	// insert new fence for reformulated left block of smaller keys
 
+	ptr = (BtKey*)fencekey;
 	bt_putid (value, set->page_no);
 
-	if( bt_insertkey (bt, fencekey+1, *fencekey, lvl+1, value, BtId, 1) )
+	if( bt_insertkey (bt, ptr->key, ptr->len, lvl+1, value, BtId, 1) )
 		return bt->err;
 
 	// switch fence for right block of larger keys to new right page
 
+	ptr = (BtKey*)rightkey;
 	bt_putid (value, right->page_no);
 
-	if( bt_insertkey (bt, rightkey+1, *rightkey, lvl+1, value, BtId, 1) )
+	if( bt_insertkey (bt, ptr->key, ptr->len, lvl+1, value, BtId, 1) )
 		return bt->err;
 
 	bt_unlockpage (BtLockParent, set->latch);