On commit push into tree instead of root if possible. Addresses #735.

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

newbrt/brt.c

@@ -2100,6 +2100,12 @@ int toku_close_brt (BRT brt, TOKULOGGER logger) {
 	r=toku_brt_cursor_close(c);
 	if (r!=0) return r;
     }
+
+    // Must do this work before closing the cf
+    r=toku_txn_note_close_brt(brt);
+    assert(r==0);
+    toku_omt_destroy(&brt->txns);
+
     if (brt->cf) {
 	if (logger) {
 	    assert(brt->fname);
@@ -2116,10 +2122,6 @@ int toku_close_brt (BRT brt, TOKULOGGER logger) {
     if (brt->fname) toku_free(brt->fname);
     if (brt->skey) { toku_free(brt->skey); }
     if (brt->sval) { toku_free(brt->sval); }
-    assert(toku_omt_size(brt->txns)==0);
-    r=toku_txn_note_close_brt(brt);
-    assert(r==0);
-    toku_omt_destroy(&brt->txns);
     toku_free(brt);
     return 0;
 }

newbrt/roll.c

@@ -34,18 +34,39 @@ int toku_rollback_fcreate (TXNID xid __attribute__((__unused__)),
     return 0;
 }
 
+static int find_brt_from_filenum (OMTVALUE v, void *filenumvp) {
+    FILENUM *filenump=filenumvp;
+    BRT brt = v;
+    FILENUM thisfnum = toku_cachefile_filenum(brt->cf);
+    if (thisfnum.fileid<filenump->fileid) return -1;
+    if (thisfnum.fileid>filenump->fileid) return +1;
+    return 0;
+}
+
 int toku_commit_cmdinsert (TXNID xid, FILENUM filenum, BYTESTRING key,BYTESTRING data,TOKUTXN txn) {
     CACHEFILE cf;
     //printf("%s:%d committing insert %s %s\n", __FILE__, __LINE__, key.data, data.data);
     int r = toku_cachefile_of_filenum(txn->logger->ct, filenum, &cf);
     assert(r==0);
+
     DBT key_dbt,data_dbt;
     BRT_CMD_S brtcmd = { BRT_COMMIT_BOTH, xid,
 			 .u.id={toku_fill_dbt(&key_dbt,  key.data,  key.len),
 				toku_fill_dbt(&data_dbt, data.data, data.len)}};
-    r = toku_cachefile_root_put_cmd(cf, &brtcmd, toku_txn_logger(txn));
-    if (r!=0) return r;
+
+    OMTVALUE brtv;
+    r = toku_omt_find_zero(txn->open_brts, find_brt_from_filenum, &filenum, &brtv, NULL);
+
+    if (r==DB_NOTFOUND) {
+	r = toku_cachefile_root_put_cmd(cf, &brtcmd, toku_txn_logger(txn));
+	if (r!=0) return r;
+    } else {
+	assert(r==0);
+	BRT brt = brtv;
+	r = toku_brt_root_put_cmd(brt, &brtcmd, txn->logger);
+    }
     return toku_cachefile_close(&cf, toku_txn_logger(txn));
+	
 }
 
 int toku_rollback_cmdinsert (TXNID xid, FILENUM filenum, BYTESTRING key,BYTESTRING data,TOKUTXN txn) {