Get rid of a few more cases where childkeylens are used. Addresses #126.

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

newbrt/brt-internal.h

@@ -234,6 +234,7 @@ extern u_int32_t toku_calccrc32_cmd (int type, const void *key, int keylen, cons
 extern u_int32_t toku_calccrc32_cmdstruct (BRT_CMD *cmd);
 
 // How long is the pivot key?
-unsigned int toku_brt_pivot_key_len (BRT brt, struct kv_pair *pk);
+unsigned int toku_brt_pivot_key_len (BRT, struct kv_pair *); // Given the tree
+unsigned int toku_brtnode_pivot_key_len (BRTNODE, struct kv_pair *); // Given the node
 
 #endif

newbrt/brt-serialize-test.c

@@ -66,7 +66,7 @@ static void test_serialize(void) {
     assert(dn->rand4fingerprint==randval);
     assert(dn->u.n.n_children==2);
     assert(strcmp(kv_pair_key(dn->u.n.childkeys[0]), "hello")==0);
-    assert(dn->u.n.childkeylens[0]==6);
+    assert(toku_brtnode_pivot_key_len(dn, dn->u.n.childkeys[0])==6);
     assert(dn->u.n.totalchildkeylens==6);
     assert(dn->u.n.pivotflags[0]==42);
     assert(dn->u.n.children[0]==nodesize*30);

newbrt/brt-serialize.c

@@ -37,7 +37,7 @@ static unsigned int toku_serialize_brtnode_size_slow(BRTNODE node) {
 	    size+=4;
             if (node->flags & TOKU_DB_DUPSORT) size += 4;
             size+=1; /* pivotflags */
-	    csize+=node->u.n.childkeylens[i];
+	    csize+=toku_brtnode_pivot_key_len(node, node->u.n.childkeys[i]);
 	}
 	for (i=0; i<node->u.n.n_children; i++) {
 	    size+=8; // diskoff
@@ -140,7 +140,7 @@ void toku_serialize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node)
                 wbuf_bytes(&w, kv_pair_key(node->u.n.childkeys[i]), kv_pair_keylen(node->u.n.childkeys[i]));
                 wbuf_bytes(&w, kv_pair_val(node->u.n.childkeys[i]), kv_pair_vallen(node->u.n.childkeys[i]));
             } else {
-                wbuf_bytes(&w, kv_pair_key(node->u.n.childkeys[i]), node->u.n.childkeylens[i]);
+                wbuf_bytes(&w, kv_pair_key(node->u.n.childkeys[i]), toku_brtnode_pivot_key_len(node, node->u.n.childkeys[i]));
             }
 	    //printf("%s:%d w.ndone=%d (childkeylen[%d]=%d\n", __FILE__, __LINE__, w.ndone, i, node->childkeylens[i]);
 	}
@@ -315,7 +315,7 @@ int toku_deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int fl
                 result->u.n.childkeys[i] = kv_pair_malloc((void*)childkeyptr, result->u.n.childkeylens[i], 0, 0);
             }
             //printf(" key %d length=%d data=%s\n", i, result->childkeylens[i], result->childkeys[i]);
-	    result->u.n.totalchildkeylens+=result->u.n.childkeylens[i];
+	    result->u.n.totalchildkeylens+=toku_brtnode_pivot_key_len(result, result->u.n.childkeys[i]);
 	}
 	for (i=0; i<result->u.n.n_children; i++) {
 	    result->u.n.children[i] = rbuf_diskoff(&rc);
@@ -578,3 +578,18 @@ int toku_deserialize_brtheader_from (int fd, DISKOFF off, struct brt_header **br
     return 0;
 }
 
+unsigned int toku_brt_pivot_key_len (BRT brt, struct kv_pair *pk) {
+    if (brt->flags & TOKU_DB_DUPSORT) {
+	return kv_pair_keylen(pk) + kv_pair_vallen(pk);
+    } else {
+	return kv_pair_keylen(pk);
+    }
+}
+
+unsigned int toku_brtnode_pivot_key_len (BRTNODE node, struct kv_pair *pk) {
+    if (node->flags & TOKU_DB_DUPSORT) {
+	return kv_pair_keylen(pk) + kv_pair_vallen(pk);
+    } else {
+	return kv_pair_keylen(pk);
+    }
+}

newbrt/brt.c

@@ -123,14 +123,6 @@ static void fixup_child_fingerprint(BRTNODE node, int childnum_of_node, BRTNODE
     node->dirty=1;
 }
 
-unsigned int toku_brt_pivot_key_len (BRT brt, struct kv_pair *pk) {
-    if (brt->flags & TOKU_DB_DUPSORT) {
-	return kv_pair_keylen(pk) + kv_pair_vallen(pk);
-    } else {
-	return kv_pair_keylen(pk);
-    }
-}
-
 static int brt_compare_pivot(BRT brt, DBT *key, DBT *data, bytevec ck) {
     int cmp;
     DBT mydbt;
@@ -489,22 +481,22 @@ static void brt_nonleaf_split (BRT t, BRTNODE node, BRTNODE *nodea, BRTNODE *nod
 	    A->u.n.childkeylens[i] = node->u.n.childkeylens[i];
             A->u.n.pivotflags[i] = node->u.n.pivotflags[i];
 	    A->u.n.totalchildkeylens += node->u.n.childkeylens[i];
-	    node->u.n.totalchildkeylens -= node->u.n.childkeylens[i];
+	    node->u.n.totalchildkeylens -= toku_brt_pivot_key_len(t, node->u.n.childkeys[i]);
 	    node->u.n.childkeys[i] = 0;
 	    node->u.n.childkeylens[i] = 0;
 	}
 	splitk->data = (void*)(node->u.n.childkeys[n_children_in_a-1]);
-	splitk->size = node->u.n.childkeylens[n_children_in_a-1];
+	splitk->size = toku_brt_pivot_key_len(t, node->u.n.childkeys[n_children_in_a-1]);
         splitk->flags = node->u.n.pivotflags[n_children_in_a-1];
-	node->u.n.totalchildkeylens -= node->u.n.childkeylens[n_children_in_a-1];
+	node->u.n.totalchildkeylens -= toku_brt_pivot_key_len(t, node->u.n.childkeys[n_children_in_a-1]);
 	node->u.n.childkeys[n_children_in_a-1]=0;
 	node->u.n.childkeylens[n_children_in_a-1]=0;
 	for (i=n_children_in_a; i<node->u.n.n_children-1; i++) {
 	    B->u.n.childkeys[i-n_children_in_a] = node->u.n.childkeys[i];
 	    B->u.n.childkeylens[i-n_children_in_a] = node->u.n.childkeylens[i];
             B->u.n.pivotflags[i-n_children_in_a] = node->u.n.pivotflags[i];
-	    B->u.n.totalchildkeylens += node->u.n.childkeylens[i];
-	    node->u.n.totalchildkeylens -= node->u.n.childkeylens[i];
+	    B->u.n.totalchildkeylens += toku_brt_pivot_key_len(t, node->u.n.childkeys[i]);
+	    node->u.n.totalchildkeylens -= toku_brt_pivot_key_len(t, node->u.n.childkeys[i]);
 	    node->u.n.childkeys[i] = 0;
 	    node->u.n.childkeylens[i] = 0;
 	}