Commit 8ab0538b authored by Barry Perlman's avatar Barry Perlman Committed by Yoni Fogel

Added support for loader flag LOADER_USE_PUTS. Still need to add tests for...

Added support for loader flag LOADER_USE_PUTS.  Still need to add tests for enospc and crash/recovery.

git-svn-id: file:///svn/toku/tokudb@19766 c7de825b-a66e-492c-adef-691d508d4ae1
parent caac250a
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
* *
* Decide how to test on recovery (using checkpoint_stress technique?), implement. * Decide how to test on recovery (using checkpoint_stress technique?), implement.
* *
* Consider USE_PUTS * Consider USE_PUTS:
* - no new inames
* - no test for old names deleted
* *
*/ */
...@@ -367,7 +369,7 @@ static void test_loader(enum test_type t, DB **dbs) ...@@ -367,7 +369,7 @@ static void test_loader(enum test_type t, DB **dbs)
db_flags[i] = DB_NOOVERWRITE; db_flags[i] = DB_NOOVERWRITE;
dbt_flags[i] = 0; dbt_flags[i] = 0;
} }
uint32_t loader_flags = 0; //USE_PUTS; // set with -p option uint32_t loader_flags = USE_PUTS; // set with -p option
if (verbose) printf("old inames:\n"); if (verbose) printf("old inames:\n");
get_inames(old_inames, dbs); get_inames(old_inames, dbs);
...@@ -382,6 +384,7 @@ static void test_loader(enum test_type t, DB **dbs) ...@@ -382,6 +384,7 @@ static void test_loader(enum test_type t, DB **dbs)
r = loader->set_poll_function(loader, poll_function, expect_poll_void); r = loader->set_poll_function(loader, poll_function, expect_poll_void);
CKERR(r); CKERR(r);
printf("USE_PUTS = %d\n", USE_PUTS);
if (verbose) printf("new inames:\n"); if (verbose) printf("new inames:\n");
get_inames(new_inames, dbs); get_inames(new_inames, dbs);
...@@ -427,20 +430,22 @@ static void test_loader(enum test_type t, DB **dbs) ...@@ -427,20 +430,22 @@ static void test_loader(enum test_type t, DB **dbs)
printf(" done\n"); printf(" done\n");
if (t == commit) { if (t == commit) {
if (verbose) printf("Testing commit\n");
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
CKERR(r); CKERR(r);
if (!USE_PUTS) {
assert_inames_missing(old_inames); assert_inames_missing(old_inames);
}
if ( CHECK_RESULTS ) { if ( CHECK_RESULTS ) {
check_results(dbs); check_results(dbs);
} }
} }
else { else {
if (verbose) printf("Testing abort\n");
r = txn->abort(txn); r = txn->abort(txn);
CKERR(r); CKERR(r);
if (!USE_PUTS) {
assert_inames_missing(new_inames); assert_inames_missing(new_inames);
} }
}
} }
...@@ -541,7 +546,8 @@ static void do_args(int argc, char * const argv[]) { ...@@ -541,7 +546,8 @@ static void do_args(int argc, char * const argv[]) {
} else if (strcmp(argv[0], "-c")==0) { } else if (strcmp(argv[0], "-c")==0) {
CHECK_RESULTS = 1; CHECK_RESULTS = 1;
} else if (strcmp(argv[0], "-p")==0) { } else if (strcmp(argv[0], "-p")==0) {
USE_PUTS = 1; USE_PUTS = LOADER_USE_PUTS;
printf("Using puts\n");
} else { } else {
fprintf(stderr, "Unknown arg: %s\n", argv[0]); fprintf(stderr, "Unknown arg: %s\n", argv[0]);
resultcode=1; resultcode=1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment