add bulk memory operations and memtest

[tedtools.git] / tbtree.c

diff --git a/tbtree.c b/tbtree.c
index 949c88e..1096a94 100644 (file)
--- a/tbtree.c
+++ b/tbtree.c
@@ -588,8 +588,6 @@ packInternalKV(TBTree *db, TBTPage *page, TBTPointer *ptr, TBTValue *key, u_int3
        if ( db->keylen ) {
                if ( key->value )
                        memcpy( ptr->key.fixed.key, key->value, db->keylen );
-               else
-                       memset( ptr->key.fixed.key, 0, db->keylen );
        } else {
                page->freespace -= PTRALIGN(key->length);
                ptr->key.varlen.length = key->length;
@@ -600,13 +598,11 @@ packInternalKV(TBTree *db, TBTPage *page, TBTPointer *ptr, TBTValue *key, u_int3
        ptr->pointer.internal.link = pagenumber;
 }
 
-
 static void
 deleteKV(TBTree *db, TBTPage *page, TBTPointer **ptrs, u_int32_t num) {
-       static char buf[TBTREEPAGESIZE];
-       char  *bufptr = buf;
        TBTPointer *ptr = (TBTPointer*)page->data, *tmp, **ptrptr = ptrs;
-       u_int32_t i, start;
+       u_int32_t i;
+
        /* suppose ptrs are ordered! */
        tmp = ptr;
        while( ptrptr - ptrs < num && (char*)ptr - page->data < db->pointersize*page->npointer ) {
@@ -632,25 +628,30 @@ deleteKV(TBTree *db, TBTPage *page, TBTPointer **ptrs, u_int32_t num) {
 
        page->npointer-=num;
 
-       tmp = (TBTPointer*)page->data;
-       start = page->npointer * db->pointersize + page->freespace;
-       for(i=0;i<page->npointer;i++) {
-               if ( page->isleaf ) {
-                       memcpy( bufptr, page->data + tmp->pointer.leaf.offset, tmp->pointer.leaf.length );
-                       tmp->pointer.leaf.offset = start + (bufptr-buf);
-                       bufptr+=PTRALIGN(tmp->pointer.leaf.length);
+       if ( page->isleaf || db->keylen == 0 ) {
+               static char buf[TBTREEPAGESIZE];
+               char  *bufptr = buf;
+               u_int32_t start = page->npointer * db->pointersize + page->freespace;
+
+               tmp = (TBTPointer*)page->data;
+               for(i=0;i<page->npointer;i++) {
+                       if ( page->isleaf ) {
+                               memcpy( bufptr, page->data + tmp->pointer.leaf.offset, tmp->pointer.leaf.length );
+                               tmp->pointer.leaf.offset = start + (bufptr-buf);
+                               bufptr+=PTRALIGN(tmp->pointer.leaf.length);
+                       }
+       
+                       if ( db->keylen == 0 ) {
+                               if ( tmp->key.varlen.length )
+                                       memcpy( bufptr, page->data + tmp->key.varlen.offset, tmp->key.varlen.length );
+                               tmp->key.varlen.offset = start + (bufptr-buf);
+                               bufptr+=PTRALIGN(tmp->key.varlen.length);
+                       }
+                       tmp = (TBTPointer*)( (char*)tmp + db->pointersize );
                }
 
-               if ( db->keylen == 0 ) {
-                       if ( tmp->key.varlen.length )
-                               memcpy( bufptr, page->data + tmp->key.varlen.offset, tmp->key.varlen.length );
-                       tmp->key.varlen.offset = start + (bufptr-buf);
-                       bufptr+=PTRALIGN(tmp->key.varlen.length);
-               }
-               tmp = (TBTPointer*)( (char*)tmp + db->pointersize );
+               memcpy( page->data + start, buf, bufptr-buf );
        }
-
-       memcpy( page->data + start, buf, bufptr-buf );
 }
 
 static u_int32_t