Skip to content

M
mariadb
Commit 8d8de7dd authored by Yoni Fogel's avatar Yoni Fogel
Browse files
Options

Cleaned up test_txn_nested_abort[23].c 

git-svn-id: file:///svn/tokudb@5731 c7de825b-a66e-492c-adef-691d508d4ae1
parent 94352a78
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 70 deletions
src/tests/test_txn_nested_abort2.c
View file @ 8d8de7dd
...@@ -19,73 +19,61 @@ void test_txn_abort() { ...@@ -19,73 +19,61 @@ void test_txn_abort() {
DB_TXN* txn_all = NULL; DB_TXN* txn_all = NULL;
DB_TXN* txn_stmt = NULL; DB_TXN* txn_stmt = NULL;
DB_TXN* txn_sp = NULL; DB_TXN* txn_sp = NULL;
r = db_env_create(&env, 0); assert(r == 0); r = db_env_create(&env, 0); CKERR(r);
r = env->set_data_dir(env, ENVDIR); r = env->set_data_dir(env, ENVDIR);
r = env->set_lg_dir(env, ENVDIR); r = env->set_lg_dir(env, ENVDIR);
r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, 0777); r = env->open(env, 0, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, 0777);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
DB_TXN *txn = 0; DB_TXN *txn = 0;
r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); r = env->txn_begin(env, 0, &txn, 0); CKERR(r);
DB *db; DB *db;
r = db_create(&db, env, 0); assert(r == 0); r = db_create(&db, env, 0); CKERR(r);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); assert(r == 0); r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); CKERR(r);
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); CKERR(r);
r = env->txn_begin(env, 0, &txn_all, 0); assert(r == 0); r = env->txn_begin(env, 0, &txn_all, 0); CKERR(r);
r = env->txn_begin(env, txn_all, &txn_stmt, 0); assert(r == 0); r = env->txn_begin(env, txn_all, &txn_stmt, 0); CKERR(r);
i = 1; i = 1;
r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0); r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC); r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
txn_stmt = NULL; txn_stmt = NULL;
r = env->txn_begin(env, txn_all, &txn_sp, 0); assert(r == 0); r = env->txn_begin(env, txn_all, &txn_sp, 0); CKERR(r);
r = env->txn_begin(env, txn_sp, &txn_stmt, 0); assert(r == 0); r = env->txn_begin(env, txn_sp, &txn_stmt, 0); CKERR(r);
i = 2; i = 2;
r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0); r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC); r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
txn_stmt = NULL; txn_stmt = NULL;
r = txn_all->abort(txn_all); r = txn_all->abort(txn_all);
if (r != 0) printf("%s:%d:abort:%d\n", __FILE__, __LINE__, r); CKERR(r);
assert (r==0);
/* walk the db, should be empty */ /* walk the db, should be empty */
r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); r = env->txn_begin(env, 0, &txn, 0); CKERR(r);
DBC *cursor; DBC *cursor;
r = db->cursor(db, txn, &cursor, 0); assert(r == 0); r = db->cursor(db, txn, &cursor, 0); CKERR(r);
memset(&key, 0, sizeof key); memset(&key, 0, sizeof key);
memset(&val, 0, sizeof val); memset(&val, 0, sizeof val);
r = cursor->c_get(cursor, &key, &val, DB_FIRST); r = cursor->c_get(cursor, &key, &val, DB_FIRST);
if (r == 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR2(r, DB_NOTFOUND);
assert(r == DB_NOTFOUND); r = cursor->c_close(cursor); CKERR(r);
r = cursor->c_close(cursor); assert(r == 0);
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
r = db->close(db, 0); assert(r == 0); r = db->close(db, 0); CKERR(r);
r = env->close(env, 0); assert(r == 0); r = env->close(env, 0); CKERR(r);
} }
int main(int argc, char *argv[]) { int main(int argc, const char *argv[]) {
int i; parse_args(argc, argv);
for (i = 1; i < argc; i++) {
char *arg = argv[i];
if (strcmp(arg, "-v") == 0 || strcmp(arg, "--verbose") == 0) {
verbose++;
continue;
}
}
test_txn_abort(); test_txn_abort();
return 0; return 0;
} }
src/tests/test_txn_nested_abort3.c
View file @ 8d8de7dd
...@@ -19,38 +19,37 @@ void test_txn_abort() { ...@@ -19,38 +19,37 @@ void test_txn_abort() {
DB_TXN* txn_all = NULL; DB_TXN* txn_all = NULL;
DB_TXN* txn_stmt = NULL; DB_TXN* txn_stmt = NULL;
DB_TXN* txn_sp = NULL; DB_TXN* txn_sp = NULL;
r = db_env_create(&env, 0); assert(r == 0); r = db_env_create(&env, 0); CKERR(r);
r = env->set_data_dir(env, ENVDIR); r = env->set_data_dir(env, ENVDIR);
r = env->set_lg_dir(env, ENVDIR); r = env->set_lg_dir(env, ENVDIR);
r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, 0777); r = env->open(env, 0, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, 0777);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
DB_TXN *txn = 0; {
r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); DB_TXN *txn = 0;
r = env->txn_begin(env, 0, &txn, 0); CKERR(r);
DB *db; DB *db;
r = db_create(&db, env, 0); assert(r == 0); r = db_create(&db, env, 0); CKERR(r);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); assert(r == 0); r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); CKERR(r);
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); CKERR(r);
}
r = env->txn_begin(env, 0, &txn_all, 0); assert(r == 0); r = env->txn_begin(env, 0, &txn_all, 0); CKERR(r);
r = env->txn_begin(env, txn_all, &txn_stmt, 0); assert(r == 0); r = env->txn_begin(env, txn_all, &txn_stmt, 0); CKERR(r);
i = 1; i = 1;
r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0); r = db->put(db, txn_stmt, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC); r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
txn_stmt = NULL; txn_stmt = NULL;
r = env->txn_begin(env, txn_all, &txn_sp, 0); assert(r == 0); r = env->txn_begin(env, txn_all, &txn_sp, 0); CKERR(r);
r = env->txn_begin(env, txn_sp, &txn_stmt, 0); assert(r == 0); r = env->txn_begin(env, txn_sp, &txn_stmt, 0); CKERR(r);
r = db->del(db, txn_stmt, dbt_init(&key, &i, sizeof i), 0); r = db->del(db, txn_stmt, dbt_init(&key, &i, sizeof i), 0);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR(r);
assert(r == 0);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC); r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
...@@ -58,35 +57,26 @@ void test_txn_abort() { ...@@ -58,35 +57,26 @@ void test_txn_abort() {
r = txn_all->abort(txn_all); r = txn_all->abort(txn_all);
if (r != 0) printf("%s:%d:abort:%d\n", __FILE__, __LINE__, r); CKERR(r);
assert (r==0);
/* walk the db, should be empty */ /* walk the db, should be empty */
r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); r = env->txn_begin(env, 0, &txn, 0); CKERR(r);
DBC *cursor; DBC *cursor;
r = db->cursor(db, txn, &cursor, 0); assert(r == 0); r = db->cursor(db, txn, &cursor, 0); CKERR(r);
memset(&key, 0, sizeof key); memset(&key, 0, sizeof key);
memset(&val, 0, sizeof val); memset(&val, 0, sizeof val);
r = cursor->c_get(cursor, &key, &val, DB_FIRST); r = cursor->c_get(cursor, &key, &val, DB_FIRST);
if (r == 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); CKERR2(r, DB_NOTFOUND);
assert(r == DB_NOTFOUND); r = cursor->c_close(cursor); CKERR(r);
r = cursor->c_close(cursor); assert(r == 0);
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
r = db->close(db, 0); assert(r == 0); r = db->close(db, 0); CKERR(r);
r = env->close(env, 0); assert(r == 0); r = env->close(env, 0); CKERR(r);
} }
int main(int argc, char *argv[]) { int main(int argc, const char *argv[]) {
int i; parse_args(argc, argv);
for (i = 1; i < argc; i++) {
char *arg = argv[i];
if (strcmp(arg, "-v") == 0 || strcmp(arg, "--verbose") == 0) {
verbose++;
continue;
}
}
test_txn_abort(); test_txn_abort();
return 0; return 0;
} }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7