{{{test-recover3.tdb}}} now runs. Addresses #558.

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

newbrt/brt-serialize.c

@@ -440,13 +440,17 @@ void toku_verify_counts (BRTNODE node) {
 	assert(node->u.l.buffer);
 	unsigned int sum=0;
 	unsigned int count=0;
-	GPMA_ITERATE(node->u.l.buffer, idx, dlen, dvadata,
+	u_int32_t    fp=0;
+	GPMA_ITERATE(node->u.l.buffer, idx, dlen, ddata,
 		     ({
 			 count++;
 			 sum+=(PMA_ITEM_OVERHEAD + dlen);
+			 fp += toku_calccrc32_kvpair_struct(ddata);
 		     }));
 	assert(count==toku_gpma_n_entries(node->u.l.buffer));
 	assert(sum==node->u.l.n_bytes_in_buffer);
+	u_int32_t fps = node->rand4fingerprint *fp;
+	assert(fps==node->local_fingerprint);
     } else {
 	unsigned int sum = 0;
 	int i;

newbrt/recover.c

@@ -490,7 +490,7 @@ int move_indices (GPMA from, struct mempool *from_mempool,
 	struct gitem item = from->items[idx];
 	items[i]=item;
 	from->items[idx].data = 0;
-	fp += toku_crc32(toku_null_crc, item.data, item.len);
+	fp += toku_calccrc32_kvpair_struct(item.data);
 	sizediff += PMA_ITEM_OVERHEAD + item.len;
 	assert(kv_pair_size(item.data)==item.len);
     }