Merge in the final hash shortcuts.

{{{
svn merge -r4633:4638 https://svn.tokutek.com/tokudb/tokudb.906
}}}

Addresses #906.


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

newbrt/brt-internal.h

@@ -107,6 +107,13 @@ enum {
     BRT_PIVOT_FRONT_COMPRESS = 8,
 };
 
+struct remembered_hash {
+    BOOL    valid;      // set to FALSE if the fullhash is invalid
+    FILENUM fnum; 
+    DISKOFF root;
+    u_int32_t fullhash; // fullhash is the hashed value of fnum and root.
+};
+
 struct brt_header {
     int dirty;
     u_int32_t fullhash;
@@ -117,6 +124,7 @@ struct brt_header {
     int n_named_roots; /* -1 if the only one is unnamed */
     char  **names;             // an array of names.  NULL if subdatabases are not allowed.
     DISKOFF *roots;            // an array of DISKOFFs.  Element 0 holds the element if no subdatabases allowed.
+    struct remembered_hash *root_hashes;     // an array of hashes of the root offsets.
     unsigned int *flags_array; // an array of flags.  Element 0 holds the element if no subdatabases allowed.
     
     FIFO fifo; // all the abort and commit commands.  If the header gets flushed to disk, we write the fifo contents beyond the unused_memory.
@@ -180,7 +188,7 @@ extern cachetable_flush_func_t toku_brtnode_flush_callback, toku_brtheader_flush
 extern cachetable_fetch_func_t toku_brtnode_fetch_callback, toku_brtheader_fetch_callback;
 extern int toku_read_and_pin_brt_header (CACHEFILE cf, struct brt_header **header);
 extern int toku_unpin_brt_header (BRT brt);
-extern CACHEKEY* toku_calculate_root_offset_pointer (BRT brt);
+extern CACHEKEY* toku_calculate_root_offset_pointer (BRT brt, u_int32_t *root_hash);
 
 static const BRTNODE null_brtnode=0;
 

newbrt/brt-serialize.c

@@ -595,10 +595,12 @@ static int deserialize_brtheader_6_or_earlier (int fd, DISKOFF off, struct brt_h
 	MALLOC_N(h->n_named_roots, h->flags_array);
 	for (i=0; i<h->n_named_roots; i++) h->flags_array[i]=flags_for_all;
 	MALLOC_N(h->n_named_roots, h->roots);
-	if (h->n_named_roots > 0 && h->roots == NULL) {ret = ENOMEM; goto died1;}
+	MALLOC_N(h->n_named_roots, h->root_hashes);
+	if (h->n_named_roots > 0 && (h->roots == NULL || h->root_hashes==NULL)) {ret = ENOMEM; goto died1;}
 	if (0) {
 	died2:
 	    toku_free(h->roots);
+	    toku_free(h->root_hashes);
 	    goto died1;
 	}
 	MALLOC_N(h->n_named_roots, h->names);
@@ -615,6 +617,7 @@ static int deserialize_brtheader_6_or_earlier (int fd, DISKOFF off, struct brt_h
 	for (i=0; i<h->n_named_roots; i++) {
 	    bytevec nameptr;
 	    unsigned int len;
+	    h->root_hashes[i].valid = FALSE;
 	    h->roots[i] = rbuf_diskoff(&rc);
 	    rbuf_bytes(&rc, &nameptr, &len);
 	    if (strlen(nameptr)+1!=len) {ret = EINVAL; goto died3;}
@@ -625,9 +628,10 @@ static int deserialize_brtheader_6_or_earlier (int fd, DISKOFF off, struct brt_h
     } else {
 	MALLOC_N(1, h->flags_array);
 	MALLOC_N(1, h->roots);
+	MALLOC_N(1, h->root_hashes);
 	h->flags_array[0]=flags_for_all;
 	h->roots[0] = rbuf_diskoff(&rc);
-
+	h->root_hashes[0].valid = FALSE;
 	h->names = 0;
     }
     if (rc.ndone!=rc.size) {ret = EINVAL; goto died3;}
@@ -665,8 +669,10 @@ int deserialize_brtheader_7_or_later(u_int32_t size, int fd, DISKOFF off, struct
 	int n_to_malloc = (h->n_named_roots == 0) ? 1 : h->n_named_roots;
 	MALLOC_N(n_to_malloc, h->flags_array); if (h->flags_array==0) { ret=errno; if (0) { died2: free(h->flags_array); }                    goto died1; }
 	MALLOC_N(n_to_malloc, h->roots);       if (h->roots==0)       { ret=errno; if (0) { died3: if (h->n_named_roots>=0) free(h->roots); } goto died2; }
-	MALLOC_N(n_to_malloc, h->names);       if (h->names==0)       { ret=errno; if (0) { died4: if (h->n_named_roots>=0) free(h->names); } goto died3; }
+	MALLOC_N(n_to_malloc, h->root_hashes); if (h->root_hashes==0) { ret=errno; if (0) { died4: if (h->n_named_roots>=0) free(h->root_hashes); } goto died3; }
+	MALLOC_N(n_to_malloc, h->names);       if (h->names==0)       { ret=errno; if (0) { died5: if (h->n_named_roots>=0) free(h->names); } goto died4; }
 	for (i=0; i<h->n_named_roots; i++) {
+	    h->root_hashes[i].valid = FALSE;
 	    h->roots[i]       = rbuf_diskoff(&rc);
 	    h->flags_array[i] = rbuf_int(&rc);
 	    bytevec nameptr;
@@ -680,11 +686,13 @@ int deserialize_brtheader_7_or_later(u_int32_t size, int fd, DISKOFF off, struct
 	int n_to_malloc = 1;
 	MALLOC_N(n_to_malloc, h->flags_array); if (h->flags_array==0) { ret=errno; goto died1; }
 	MALLOC_N(n_to_malloc, h->roots);       if (h->roots==0) { ret=errno; goto died2; }
+	MALLOC_N(n_to_malloc, h->root_hashes); if (h->root_hashes==0) { ret=errno; goto died3; }
 	h->names = 0;
 	h->roots[0] = rbuf_diskoff(&rc);
+	h->root_hashes[0].valid = FALSE;
 	h->flags_array[0] = rbuf_int(&rc);
     }
-    if (rc.ndone!=rc.size) {ret = EINVAL; goto died4;}
+    if (rc.ndone!=rc.size) {ret = EINVAL; goto died5;}
     toku_free(rc.buf);
     *brth = h;
     return 0;

newbrt/brt-test-helpers.c

@@ -51,6 +51,7 @@ 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->roots[0] = diskoff;
+    brt->h->root_hashes[0].valid = FALSE;
     r = toku_unpin_brt_header(brt);
     return r;
 }

newbrt/brt-verify.c

@@ -151,7 +151,8 @@ int toku_verify_brt (BRT brt) {
 	if (0) { died0: toku_unpin_brt_header(brt); }
 	return r;
     }
-    rootp = toku_calculate_root_offset_pointer(brt);
+    u_int32_t root_hash;
+    rootp = toku_calculate_root_offset_pointer(brt, &root_hash);
     if ((r=toku_verify_brtnode(brt, *rootp, 0, 0, 0, 0, 1))) goto died0;
     if ((r = toku_unpin_brt_header(brt))!=0) return r;
     return 0;

newbrt/recover.c

@@ -142,8 +142,10 @@ static void toku_recover_fheader (LSN UU(lsn), TXNID UU(txnid),FILENUM filenum,L
     r=toku_fifo_create(&h->fifo);
     assert(r==0);
     if ((signed)header.n_named_roots==-1) {
-	MALLOC_N(1, h->roots); assert(h->roots);
+	MALLOC_N(1, h->roots);       assert(h->roots);
+	MALLOC_N(1, h->root_hashes); assert(h->root_hashes);
 	h->roots[0] = header.u.one.root;
+	h->root_hashes[0].valid= FALSE;
     } else {
 	assert(0);
     }
@@ -656,6 +658,7 @@ void toku_recover_changeunnamedroot (LSN UU(lsn), FILENUM filenum, DISKOFF UU(ol
     r = toku_read_and_pin_brt_header(pair->cf, &pair->brt->h);
     assert(r==0);
     pair->brt->h->roots[0] = newroot;
+    pair->brt->h->root_hashes[0].valid = FALSE;
     r = toku_unpin_brt_header(pair->brt);
 }
 void toku_recover_changenamedroot (LSN UU(lsn), FILENUM UU(filenum), BYTESTRING UU(name), DISKOFF UU(oldroot), DISKOFF UU(newroot)) { assert(0); }