Fix bugs in cleanpage and splitpage copying values across.

[btree] / threadskv5.c

diff --git a/threadskv5.c b/threadskv5.c
index b5df26d617fe1e242a86a87a593163ae94878553..42293dcc80c0d5d0d59b9df6f7be0ccd194579d8 100644 (file)
--- a/threadskv5.c
+++ b/threadskv5.c
@@ -905,6 +905,8 @@ SYSTEM_INFO sysinfo[1];
                        return free(mgr), free(latchmgr), NULL;
        } else if( mode == BT_ro )
                return free(latchmgr), bt_mgrclose (mgr), NULL;
+       else
+               initit = 1;
 #else
        latchmgr = VirtualAlloc(NULL, BT_maxpage, MEM_COMMIT, PAGE_READWRITE);
        size = GetFileSize(mgr->idx, amt);
@@ -1707,6 +1709,7 @@ BtPageSet right2[1];
        bt_putid(right2->page->left, left_page_no);
        bt_unlockpage (BtLockWrite, right2->latch);
        bt_unpinlatch (right2->latch);
+       bt_unpinpool (right2->pool);
        return 0;
 }
 
@@ -1716,8 +1719,8 @@ BtPageSet right2[1];
 BTERR bt_deletekey (BtDb *bt, unsigned char *key, uint len, uint lvl)
 {
 unsigned char lowerfence[BT_keyarray], higherfence[BT_keyarray];
-BtPageSet set[1], right[1], right2[1];
 uint slot, idx, found, fence;
+BtPageSet set[1], right[1];
 unsigned char value[BtId];
 BtKey *ptr, *tst;
 BtVal *val;
@@ -2005,8 +2008,7 @@ BtVal *val;
 
                val = valptr(bt->frame, cnt);
                nxt -= val->len + sizeof(BtVal);
-               ((unsigned char *)page)[nxt] = val->len;
-               memcpy ((unsigned char *)page + nxt + sizeof(BtVal), val->value, val->len);
+               memcpy ((unsigned char *)page + nxt, val, val->len + sizeof(BtVal));
 
                // copy the key across
 
@@ -2140,14 +2142,11 @@ uint prev;
                        continue;
                src = valptr(set->page, cnt);
                nxt -= src->len + sizeof(BtVal);
-               val = (BtVal*)((unsigned char *)bt->frame + nxt);
-               memcpy (val->value, src->value, src->len);
-               val->len = src->len;
+               memcpy ((unsigned char *)bt->frame + nxt, src, src->len + sizeof(BtVal));
 
                key = keyptr(set->page, cnt);
                nxt -= key->len + sizeof(BtKey);
-               ptr = (BtKey*)((unsigned char *)bt->frame + nxt);
-               memcpy (ptr, key, key->len + sizeof(BtKey));
+               memcpy ((unsigned char *)bt->frame + nxt, key, key->len + sizeof(BtVal));
 
                //      add librarian slot
 
@@ -2215,10 +2214,9 @@ uint prev;
        while( cnt++ < max ) {
                if( slotptr(bt->frame, cnt)->dead )
                        continue;
-               val = valptr(bt->frame, cnt);
-               nxt -= val->len + sizeof(BtVal);
-               ((unsigned char *)set->page)[nxt] = val->len;
-               memcpy ((unsigned char *)set->page + nxt + sizeof(BtVal), val->value, val->len);
+               src = valptr(bt->frame, cnt);
+               nxt -= src->len + sizeof(BtVal);
+               memcpy ((unsigned char *)set->page + nxt, src, src->len + sizeof(BtVal));
 
                key = keyptr(bt->frame, cnt);
                nxt -= key->len + sizeof(BtKey);