Separate some of the test helpers from brt.c to brt-test-helpers.c. Addresses #472.

git-svn-id: file:///svn/tokudb@2556 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/Makefile

@@ -133,8 +133,8 @@ BRT_INTERNAL_H_INCLUDES = brt-internal.h cachetable.h fifo.h pma.h brt.h brttype
 key.o: brttypes.h key.h
 list-test: list-test.o toku_assert.o
 test-brt-delete-both: ybt.o brt.o fifo.o pma.o memory.o brt-serialize.o cachetable.o ybt.o key.o primes.o toku_assert.o log.o mempool.o brt-verify.o fingerprint.o log_code.o roll.o
-test-inc-split: test-inc-split.o brt.o toku_assert.o key.o ybt.o cachetable.o memory.o log.o pma.o log_code.o fifo.o fingerprint.o brt-serialize.o brt-verify.o roll.o primes.o mempool.o
-test-del-inorder: test-del-inorder.o brt.o toku_assert.o key.o ybt.o cachetable.o memory.o log.o pma.o log_code.o fifo.o fingerprint.o brt-serialize.o brt-verify.o roll.o primes.o mempool.o
+test-inc-split: test-inc-split.o brt.o brt-test-helpers.o toku_assert.o key.o ybt.o cachetable.o memory.o log.o pma.o log_code.o fifo.o fingerprint.o brt-serialize.o brt-verify.o roll.o primes.o mempool.o
+test-del-inorder: test-del-inorder.o brt.o brt-test-helpers.o toku_assert.o key.o ybt.o cachetable.o memory.o log.o pma.o log_code.o fifo.o fingerprint.o brt-serialize.o brt-verify.o roll.o primes.o mempool.o
 pma-test.o: $(BRT_INTERNAL_H_INCLUDES) pma-internal.h pma.h list.h mempool.h
 pma-test: pma.o memory.o key.o ybt.o log.o mempool.o fingerprint.o brt-serialize.o fifo.o primes.o toku_assert.o log_code.o  roll.o brt.o cachetable.o brt-verify.o
 pma.o: pma.h yerror.h pma-internal.h memory.h key.h ybt.h brttypes.h log.h ../include/db.h log_header.h

newbrt/brt-internal.h

@@ -175,6 +175,10 @@ struct brt_cursor {
     DBT val;
 };
 
+void toku_create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER logger);
+int toku_unpin_brtnode (BRT brt, BRTNODE node) ;
+unsigned int toku_brtnode_which_child (BRTNODE node , DBT *k, DBT *d, BRT t);
+
 /* Stuff for testing */
 int toku_testsetup_leaf(BRT brt, DISKOFF *diskoff);
 int toku_testsetup_nonleaf (BRT brt, int height, DISKOFF *diskoff, int n_children, DISKOFF *children, u_int32_t *subtree_fingerprints, char **keys, int *keylens);

newbrt/brt-test-helpers.c

+#include "brt-internal.h"
+#include "toku_assert.h"
+
+int toku_testsetup_leaf(BRT brt, DISKOFF *diskoff) {
+    BRTNODE node;
+    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
+    if (r!=0) return r;
+    toku_create_new_brtnode(brt, &node, 0, (TOKULOGGER)0);
+    *diskoff = node->thisnodename;
+    r = toku_unpin_brtnode(brt, node);
+    if (r!=0) return r;
+    r = toku_unpin_brt_header(brt);
+    if (r!=0) return r;
+    return 0;
+}
+
+// Don't bother to clean up carefully if something goes wrong.  (E.g., it's OK to have malloced stuff that hasn't been freed.)
+int toku_testsetup_nonleaf (BRT brt, int height, DISKOFF *diskoff, int n_children, DISKOFF *children, u_int32_t *subtree_fingerprints, char **keys, int *keylens) {
+    BRTNODE node;
+    assert(n_children<=BRT_FANOUT);
+    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
+    if (r!=0) return r;
+    toku_create_new_brtnode(brt, &node, height, (TOKULOGGER)0);
+    node->u.n.n_children=n_children;
+    node->u.n.totalchildkeylens=0;
+    node->u.n.n_bytes_in_buffers=0;
+    int i;
+    for (i=0; i<n_children; i++) {
+	node->u.n.childinfos[i] = (struct brtnode_nonleaf_childinfo){ .subtree_fingerprint = subtree_fingerprints[i],
+								      .diskoff             = children[i],
+								      .n_bytes_in_buffer   = 0 };
+	r = toku_fifo_create(&BNC_BUFFER(node,i)); if (r!=0) return r;
+    }
+    for (i=0; i+1<n_children; i++) {
+	node->u.n.childkeys[i] = kv_pair_malloc(keys[i], keylens[i], 0, 0);
+	node->u.n.totalchildkeylens += keylens[i];
+    }
+    *diskoff = node->thisnodename;
+    r = toku_unpin_brtnode(brt, node);
+    if (r!=0) return r;
+    r = toku_unpin_brt_header(brt);
+    if (r!=0) return r;
+    return 0;
+}
+
+int toku_testsetup_root(BRT brt, DISKOFF diskoff) {
+    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
+    if (r!=0) return r;
+    brt->h->unnamed_root = diskoff;
+    r = toku_unpin_brt_header(brt);
+    return r;
+}
+
+int toku_testsetup_get_sersize(BRT brt, DISKOFF diskoff) // Return the size on disk
+{
+    void *node_v;
+    int r  = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
+					 toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
+    assert(r==0);
+    int size = toku_serialize_brtnode_size(node_v);
+    r = toku_unpin_brtnode(brt, node_v);
+    assert(r==0);
+    return size;
+}
+
+int toku_testsetup_insert_to_leaf (BRT brt, DISKOFF diskoff, char *key, int keylen, char *val, int vallen, u_int32_t *subtree_fingerprint) {
+    void *node_v;
+    int r;
+    r = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
+				    toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
+    if (r!=0) return r;
+    BRTNODE node=node_v;
+    assert(node->height==0);
+    DBT k,v;
+    int replaced_v_size;
+    enum pma_errors pma_status =
+	toku_pma_insert_or_replace(node->u.l.buffer,
+				   toku_fill_dbt(&k, key, keylen),
+				   toku_fill_dbt(&v, val, vallen),
+				   &replaced_v_size,
+				   (TOKULOGGER)0, (TXNID)0,
+				   toku_cachefile_filenum(brt->cf),
+				   node->thisnodename, node->rand4fingerprint,
+				   &node->local_fingerprint,
+				   &node->log_lsn);
+    assert(pma_status==BRT_OK);
+    if (replaced_v_size>=0) {
+	node->u.l.n_bytes_in_buffer += v.size - replaced_v_size;
+    } else {
+	node->u.l.n_bytes_in_buffer += k.size + v.size + KEY_VALUE_OVERHEAD + PMA_ITEM_OVERHEAD;
+    }
+    node->dirty=1;
+    *subtree_fingerprint = node->local_fingerprint;
+    r = toku_unpin_brtnode(brt, node_v);
+    return r;
+}
+
+int toku_testsetup_insert_to_nonleaf (BRT brt, DISKOFF diskoff, enum brt_cmd_type cmdtype, char *key, int keylen, char *val, int vallen, u_int32_t *subtree_fingerprint) {
+    void *node_v;
+    int r;
+    r = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
+				    toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
+    if (r!=0) return r;
+    BRTNODE node=node_v;
+    assert(node->height>0);
+
+    DBT k,v;
+    int childnum = toku_brtnode_which_child(node,
+				       toku_fill_dbt(&k, key, keylen),
+				       toku_fill_dbt(&v, val, vallen),
+				       brt);
+    
+    r = toku_fifo_enq(BNC_BUFFER(node, childnum), key, keylen, val, vallen, cmdtype, (TXNID)0);
+    assert(r==0);
+    u_int32_t fdelta = node->rand4fingerprint * toku_calccrc32_cmd(cmdtype, (TXNID)0, key, keylen, val, vallen);
+    node->local_fingerprint += fdelta;
+    *subtree_fingerprint += fdelta;
+    int sizediff = keylen + vallen + KEY_VALUE_OVERHEAD + BRT_CMD_OVERHEAD;
+    node->u.n.n_bytes_in_buffers += sizediff;
+    BNC_NBYTESINBUF(node, childnum) += sizediff;
+    node->dirty = 1;
+
+    r = toku_unpin_brtnode(brt, node_v);
+    return r;
+}

newbrt/brt2.c

@@ -246,7 +246,7 @@ static void initialize_brtnode (BRT t, BRTNODE n, DISKOFF nodename, int height)
     }
 }
 
-static int create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER logger) {
+int toku_create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER logger) {
     TAGMALLOC(BRTNODE, n);
     int r;
     DISKOFF name;
@@ -267,6 +267,7 @@ static int create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER lo
     return 0;
 }
 
+#ifdef FOO
 static int insert_to_buffer_in_nonleaf (BRTNODE node, int childnum, BRT_CMD cmd) {
     unsigned int n_bytes_added = BRT_CMD_OVERHEAD + KEY_VALUE_OVERHEAD + cmd->u.id.key->size + cmd->u.id.val->size;
     int r = toku_fifo_enq_cmdstruct(BNC_BUFFER(node,childnum), cmd);
@@ -277,6 +278,7 @@ static int insert_to_buffer_in_nonleaf (BRTNODE node, int childnum, BRT_CMD cmd)
     node->dirty = 1;
     return 0;
 }
+#endif
 
 
 // Split a leaf node, reusing it in new_nodes (as the last element)
@@ -487,16 +489,16 @@ static int brt_leaf_put (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER logger, WS
 	return r;
     }
     case BRT_DELETE: {
-        int r = toku_pma_delete(node->u.l.buffer, cmd->u.id.key, (DBT*)0,
-				logger, cmd->xid, node->thisnodename,
-				node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
+        int r = toku_pma_delete_fixupsize(node->u.l.buffer, cmd->u.id.key, (DBT*)0,
+					  logger, cmd->xid, node->thisnodename,
+					  node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
 	if (r==0) node->dirty=1;
 	return r;
     }
     case BRT_DELETE_BOTH: {
-        int r = toku_pma_delete(node->u.l.buffer, cmd->u.id.key, cmd->u.id.val,
-				logger, cmd->xid, node->thisnodename,
-				node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
+        int r = toku_pma_delete_fixupsize(node->u.l.buffer, cmd->u.id.key, cmd->u.id.val,
+					  logger, cmd->xid, node->thisnodename,
+					  node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
         if (r == 0) node->dirty = 1;
         return r;
     }
@@ -519,17 +521,17 @@ static int brt_leaf_strong_put (BRT t, BRTNODE node, BRT_CMD cmd, TOKULOGGER log
 	return 0;
     }
     case BRT_DELETE: {
-        int r = toku_pma_delete(node->u.l.buffer, cmd->u.id.key, (DBT*)0,
-				logger, cmd->xid, node->thisnodename,
-				node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
+        int r = toku_pma_delete_fixupsize(node->u.l.buffer, cmd->u.id.key, (DBT*)0,
+					  logger, cmd->xid, node->thisnodename,
+					  node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn, &node->u.l.n_bytes_in_buffer);
 	if (r==0) node->dirty=1;
 	if (r==DB_NOTFOUND) r=0;
 	return r;
     }
     case BRT_DELETE_BOTH: {
-        int r = toku_pma_delete(node->u.l.buffer, cmd->u.id.key, cmd->u.id.val,
-				logger, cmd->xid, node->thisnodename,
-				node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn,&node->u.l.n_bytes_in_buffer);
+        int r = toku_pma_delete_fixupsize(node->u.l.buffer, cmd->u.id.key, cmd->u.id.val,
+					  logger, cmd->xid, node->thisnodename,
+					  node->rand4fingerprint, &node->local_fingerprint, &node->log_lsn,&node->u.l.n_bytes_in_buffer);
         if (r == 0) node->dirty = 1;
 	if (r == DB_NOTFOUND) r=0;
         return r;
@@ -1832,126 +1834,3 @@ int toku_brt_height_of_root(BRT brt, int *height) {
     r = toku_unpin_brt_header(brt); assert(r==0);
     return 0;
 }
-
-int toku_testsetup_leaf(BRT brt, DISKOFF *diskoff) {
-    BRTNODE node;
-    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
-    if (r!=0) return r;
-    create_new_brtnode(brt, &node, 0, (TOKULOGGER)0);
-    *diskoff = node->thisnodename;
-    r = unpin_brtnode(brt, node);
-    if (r!=0) return r;
-    r = toku_unpin_brt_header(brt);
-    if (r!=0) return r;
-    return 0;
-}
-
-// Don't bother to clean up carefully if something goes wrong.  (E.g., it's OK to have malloced stuff that hasn't been freed.)
-int toku_testsetup_nonleaf (BRT brt, int height, DISKOFF *diskoff, int n_children, DISKOFF *children, u_int32_t *subtree_fingerprints, char **keys, int *keylens) {
-    BRTNODE node;
-    assert(n_children<=BRT_FANOUT);
-    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
-    if (r!=0) return r;
-    create_new_brtnode(brt, &node, height, (TOKULOGGER)0);
-    node->u.n.n_children=n_children;
-    node->u.n.totalchildkeylens=0;
-    node->u.n.n_bytes_in_buffers=0;
-    int i;
-    for (i=0; i<n_children; i++) {
-	node->u.n.childinfos[i] = (struct brtnode_nonleaf_childinfo){ .subtree_fingerprint = subtree_fingerprints[i],
-								      .diskoff             = children[i],
-								      .n_bytes_in_buffer   = 0 };
-	r = toku_fifo_create(&BNC_BUFFER(node,i)); if (r!=0) return r;
-    }
-    for (i=0; i+1<n_children; i++) {
-	node->u.n.childkeys[i] = kv_pair_malloc(keys[i], keylens[i], 0, 0);
-	node->u.n.totalchildkeylens += keylens[i];
-    }
-    *diskoff = node->thisnodename;
-    r = unpin_brtnode(brt, node);
-    if (r!=0) return r;
-    r = toku_unpin_brt_header(brt);
-    if (r!=0) return r;
-    return 0;
-}
-
-int toku_testsetup_root(BRT brt, DISKOFF diskoff) {
-    int r = toku_read_and_pin_brt_header(brt->cf, &brt->h);
-    if (r!=0) return r;
-    brt->h->unnamed_root = diskoff;
-    r = toku_unpin_brt_header(brt);
-    return r;
-}
-
-int toku_testsetup_get_sersize(BRT brt, DISKOFF diskoff) // Return the size on disk
-{
-    void *node_v;
-    int r  = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
-					 toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
-    assert(r==0);
-    int size = toku_serialize_brtnode_size(node_v);
-    r = unpin_brtnode(brt, node_v);
-    assert(r==0);
-    return size;
-}
-
-int toku_testsetup_insert_to_leaf (BRT brt, DISKOFF diskoff, char *key, int keylen, char *val, int vallen, u_int32_t *subtree_fingerprint) {
-    void *node_v;
-    int r;
-    r = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
-				    toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
-    if (r!=0) return r;
-    BRTNODE node=node_v;
-    assert(node->height==0);
-    DBT k,v;
-    int replaced_v_size;
-    enum pma_errors pma_status =
-	toku_pma_insert_or_replace(node->u.l.buffer,
-				   toku_fill_dbt(&k, key, keylen),
-				   toku_fill_dbt(&v, val, vallen),
-				   &replaced_v_size,
-				   (TOKULOGGER)0, (TXNID)0,
-				   toku_cachefile_filenum(brt->cf),
-				   node->thisnodename, node->rand4fingerprint,
-				   &node->local_fingerprint,
-				   &node->log_lsn);
-    assert(pma_status==BRT_OK);
-    if (replaced_v_size>=0) {
-	node->u.l.n_bytes_in_buffer += v.size - replaced_v_size;
-    } else {
-	node->u.l.n_bytes_in_buffer += k.size + v.size + KEY_VALUE_OVERHEAD + PMA_ITEM_OVERHEAD;
-    }
-    node->dirty=1;
-    *subtree_fingerprint = node->local_fingerprint;
-    r = unpin_brtnode(brt, node_v);
-    return r;
-}
-
-int toku_testsetup_insert_to_nonleaf (BRT brt, DISKOFF diskoff, enum brt_cmd_type cmdtype, char *key, int keylen, char *val, int vallen, u_int32_t *subtree_fingerprint) {
-    void *node_v;
-    int r;
-    r = toku_cachetable_get_and_pin(brt->cf, diskoff, &node_v, NULL,
-				    toku_brtnode_flush_callback, toku_brtnode_fetch_callback, brt);
-    if (r!=0) return r;
-    BRTNODE node=node_v;
-    assert(node->height>0);
-
-    DBT k,v;
-    int childnum = brtnode_which_child(node,
-				       toku_fill_dbt(&k, key, keylen),
-				       toku_fill_dbt(&v, val, vallen),
-				       brt);
-    
-    r = toku_fifo_enq(BNC_BUFFER(node, childnum), key, keylen, val, vallen, cmdtype, (TXNID)0);
-    assert(r==0);
-    u_int32_t fdelta = node->rand4fingerprint * toku_calccrc32_cmd(cmdtype, (TXNID)0, key, keylen, val, vallen);
-    node->local_fingerprint += fdelta;
-    *subtree_fingerprint += fdelta;
-    int sizediff = keylen + vallen + KEY_VALUE_OVERHEAD + BRT_CMD_OVERHEAD;
-    node->u.n.n_bytes_in_buffers += sizediff;
-    BNC_NBYTESINBUF(node, childnum) += sizediff;
-    node->dirty = 1;
-
-    r = unpin_brtnode(brt, node_v);
-    return r;
-}

newbrt/pma.h

@@ -65,9 +65,9 @@ int toku_pma_delete (PMA, DBT */*key*/, DBT */*val*/,
 		     TOKULOGGER, TXNID, DISKOFF,
 		     u_int32_t /*random for fingerprint*/, u_int32_t */*fingerprint*/, u_int32_t *deleted_size, LSN*);
 
-//??int toku_pma_delete (PMA, DBT */*key*/, DBT */*val*/,
-//		     TOKULOGGER, TXNID, DISKOFF,
-//		     u_int32_t /*random for fingerprint*/, u_int32_t */*fingerprint*/, LSN*, u_int32_t *n_bytes_in_buffer_including_overheads);
+int toku_pma_delete_fixupsize (PMA, DBT */*key*/, DBT */*val*/,
+			       TOKULOGGER, TXNID, DISKOFF,
+			       u_int32_t /*random for fingerprint*/, u_int32_t */*fingerprint*/, LSN*, u_int32_t *n_bytes_in_buffer_including_overheads);
 
 int toku_pma_strong_insert_or_replace (PMA pma, DBT *k, DBT *v,
 				     TOKULOGGER, TXNID, FILENUM, DISKOFF,