mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some more root fifo tests for bdb. closes #1721

Browse source 
git-svn-id: file:///svn/toku/tokudb@11488 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:57:51 -04:00 • committed by Yoni Fogel
parent 94898878d0
commit 192b37fe3f
4 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tests/Makefile
View file

@ -85,6 +85,9 @@ BDB_DONTRUN_TESTS = \
test_db_descriptor_named_db \
test_heaviside_straddle_1622 \
test_dbremove_old \
root_fifo_2 \
root_fifo_32 \
root_fifo_41 \
checkpoint_1 \
checkpoint_stress \
#\ ends prev line

22
src/tests/root_fifo_2.c
View file

@ -11,14 +11,15 @@ DBC *null_cursor = NULL;
static void root_fifo_verify(DB_ENV *env, int n) {
if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
int r;
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DB_TXN *txn = null_txn;
r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DBC *cursor = null_cursor;
r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
int i;
@ -41,7 +42,7 @@ static void root_fifo_verify(DB_ENV *env, int n) {
r = db->close(db, 0); assert(r == 0); db = null_db;
}
static void root_fifo_1(int n) {
static void root_fifo_2(int n) {
if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
int r;
@ -84,7 +85,12 @@ static void root_fifo_1(int n) {
root_fifo_verify(env, n);
// cleanup
r = env->close(env, 0); assert(r == 0); env = null_env;
r = env->close(env, 0);
#if TOKUDB
assert(r == 0); env = null_env;
#else
printf("%s:%d env close r=%d\n", __FUNCTION__, __LINE__, r);
#endif
}
int test_main(int argc, char *argv[]) {
@ -105,10 +111,10 @@ int test_main(int argc, char *argv[]) {
}
if (n >= 0)
root_fifo_1(n);
root_fifo_2(n);
else
for (i=0; i<100; i++)
root_fifo_1(i);
root_fifo_2(i);
return 0;
}

10
src/tests/root_fifo_32.c
View file

@ -48,14 +48,14 @@ static void root_fifo_verify(DB_ENV *env, int n) {
if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
int r;
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DB_TXN *txn = null_txn;
r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DBC *cursor = null_cursor;
r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
int i;

10
src/tests/root_fifo_41.c
View file

@ -48,14 +48,14 @@ static void root_fifo_verify(DB_ENV *env, int n, int expectn) {
if (verbose) printf("%s:%d %d %d\n", __FUNCTION__, __LINE__, n, expectn);
int r;
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DB_TXN *txn = null_txn;
r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
DB *db = null_db;
r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO);
assert(r == 0);
DBC *cursor = null_cursor;
r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
int i;