More getting brt-test to compile. Addresses #558.

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

newbrt/logformat.c

@@ -41,6 +41,9 @@ int logformat_version_number = 0;
 const struct logtype rollbacks[] = {
     {"fcreate", 'F', FA{{"BYTESTRING", "fname", 0},
 			NULLFIELD}},
+    {"fclose", 'c', FA{{"FILENUM", "filenum", 0},
+		       {"BYTESTRING", "fname", 0},
+		       NULLFIELD}},
     {"deleteatleaf", 'd', FA{{"FILENUM", "filenum", 0}, // Note a delete for rollback.   The delete takes place in a leaf.
 			     {"BYTESTRING", "key", 0},
 			     {"BYTESTRING", "data", 0},

newbrt/roll.c

@@ -12,8 +12,6 @@
 #include "cachetable.h"
 #include "key.h"
 
-#define ABORTIT { le=le; txn=txn; fprintf(stderr, "%s:%d (%s) not ready to go\n", __FILE__, __LINE__, __func__); abort(); }
-
 int toku_rollback_fcreate (BYTESTRING bs_fname,
 			   TOKUTXN    txn       __attribute__((__unused__))) {
     char *fname = fixup_fname(&bs_fname);
@@ -28,6 +26,37 @@ int toku_rollback_fcreate (BYTESTRING bs_fname,
     return 0;
 }
 
+int toku_rollback_fclose (FILENUM filenum, BYTESTRING bs_fname, TOKUTXN txn) {
+    abort();
+    filenum=filenum;
+    bs_fname=bs_fname;
+    txn=txn;
+#if 0
+    char *fixedfname = fixup_fname(&bs_fname);
+    int fd = open(fixedfname, O_RDWR, 0);
+    assert(fd>=0);
+    BRT MALLOC(brt);
+    assert(errno==0 && brt!=0);
+    brt->database_name = fixedfname;
+    brt->h=0;
+    list_init(&brt->cursors);
+    brt->compare_fun = 0;
+    brt->dup_compare = 0;
+    brt->db = 0;
+    CACHETABLE cf;
+    int r = toku_cachetable_openfd(&cf, /*ct*/0, fd, brt);
+    assert(r==0);
+    brt->skey = brt->sval = 0;
+    brt->cf = cf;
+    toku_recover_note_cachefile(filenum, cf, brt);
+
+    printf("%s:%d Must remember to close the file again after txn %p finishes aborting\n", __FILE__, __LINE__, txn);
+    
+    return 0;
+#endif
+}
+			  
+
 //int toku_rollback_newbrtnode (struct logtype_newbrtnode *le, TOKUTXN txn) {
 //    // All that must be done is to put the node on the freelist.
 //    // Since we don't have a freelist right now, we don't have anything to do.
@@ -76,3 +105,4 @@ int toku_rollback_xactiontouchednonleaf(FILENUM filenum, DISKOFFARRAY array __at
     if (array.len!=0) printf("%s:%d array.len!=0 and we didn't fix up the fingerprints.\n", __FILE__, __LINE__);
     return 0;
 }
+