Up roll.c coverage to 52.4% from 46.4%. Addresses #536.

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

src/tests/test-recover2.c

+/* A simple case to see if recovery works. */
+
+#include <db.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "test.h"
+
+static void test (void) {
+    int r;
+    system("rm -rf " ENVDIR);
+    r=mkdir(ENVDIR, 0777);                                                     assert(r==0);
+
+    DB_ENV *env;
+    DB_TXN *tid;
+    DB     *db;
+    DBT key,data;
+
+    r=db_env_create(&env, 0);                                                  assert(r==0);
+    env->set_errfile(env, stderr);
+    r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_THREAD, 0777); CKERR(r);
+
+    r=db_create(&db, env, 0);                                                  CKERR(r);
+    r=env->txn_begin(env, 0, &tid, 0);                                         assert(r==0);
+    r=db->open(db, tid, "foo.db", 0, DB_BTREE, DB_CREATE, 0777);               CKERR(r);
+    r=tid->commit(tid, 0);                                                     assert(r==0);
+
+    r=env->txn_begin(env, 0, &tid, 0);                                         assert(r==0);
+    int i;
+    const int N=1000;
+    char *keys[N];
+    char *vals[N];
+    for (i=0; i<N; i++) {
+	char ks[100];  snprintf(ks, sizeof(ks), "k%09ld.%d", random(), i);
+	char vs[1000]; snprintf(vs, sizeof(vs), "v%d.%0*d", i, (int)(sizeof(vs)-100), i);
+	keys[i]=strdup(ks);
+	vals[i]=strdup(vs);
+	r=db->put(db, tid, dbt_init(&key, ks, strlen(ks)+1), dbt_init(&data, vs, strlen(vs)+1), 0);    assert(r==0);
+    }
+    r=tid->commit(tid, 0);                                                     assert(r==0);
+
+    r=db->close(db, 0);                                                        assert(r==0);
+    r=env->close(env, 0);                                                      assert(r==0);
+
+    unlink(ENVDIR "/foo.db");
+
+    r=db_env_create(&env, 0);                                                  assert(r==0);
+    env->set_errfile(env, stderr);
+    r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_THREAD|DB_RECOVER, 0777); CKERR(r);
+    r=env->txn_begin(env, 0, &tid, 0);                                         assert(r==0);
+    r=db_create(&db, env, 0);                                                  CKERR(r);
+    r=db->open(db, tid, "foo.db", 0, DB_BTREE, 0, 0777);                       CKERR(r);
+    for (i=0; i<N; i++) {
+	r=db->get(db, tid, dbt_init(&key, keys[i], 1+strlen(keys[i])), dbt_init_malloc(&data), 0);     assert(r==0);
+	assert(strcmp(data.data, vals[i])==0);
+	free(data.data);
+	data.data=0;
+	free(keys[i]);
+	free(vals[i]);
+    }
+    r=tid->commit(tid, 0);                                                     assert(r==0);
+    free(data.data);
+    r=db->close(db, 0);                                                        CKERR(r);
+    r=env->close(env, 0);                                                      CKERR(r);
+}
+
+int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
+    test();
+    return 0;
+}
+    

src/ydb.c

@@ -232,20 +232,28 @@ static int do_recovery (DB_ENV *env) {
 	logdir = strdup(env->i->dir);
     }
     
+#if 0
     // want to do recovery in its own process
     pid_t pid;
     if ((pid=fork())==0) {
 	int r=tokudb_recover(datadir, logdir);
 	assert(r==0);
+	toku_free(logdir); // the child must also free.
 	exit(0);
     }
     int status;
     waitpid(pid, &status, 0);
     if (!WIFEXITED(status) || WEXITSTATUS(status)!=0)  {
+	toku_free(logdir);
 	return toku_ydb_do_error(env, -1, "Recovery failed\n");
     }
     toku_free(logdir);
     return 0;
+#else
+    int r = tokudb_recover(datadir, logdir);
+    toku_free(logdir);
+    return r;
+#endif
 }
 
 static int toku_env_open(DB_ENV * env, const char *home, u_int32_t flags, int mode) {