Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

Cleaned up test_txn_nested_abort[23].c 

git-svn-id: file:///svn/tokudb@5731 c7de825b-a66e-492c-adef-691d508d4ae1
pull/56/head
Yoni Fogel 18 years ago
parent
94352a78c2
commit
8d8de7dd5b
2 changed files with 48 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/tests/test_txn_nested_abort2.c
  2. 62
      src/tests/test_txn_nested_abort3.c

56
src/tests/test_txn_nested_abort2.c
View File

@ -19,73 +19,61 @@ void test_txn_abort() {
DB_TXN* txn_all = NULL;
DB_TXN* txn_stmt = 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_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);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
assert(r == 0);
r = env->open(env, 0, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, 0777);
CKERR(r);
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;
r = db_create(&db, env, 0); assert(r == 0);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); assert(r == 0);
r = txn->commit(txn, 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); CKERR(r);
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;
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));
assert(r == 0);
CKERR(r);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
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;
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));
assert(r == 0);
CKERR(r);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
txn_stmt = NULL;
r = txn_all->abort(txn_all);
if (r != 0) printf("%s:%d:abort:%d\n", __FILE__, __LINE__, r);
assert (r==0);
CKERR(r);
/* 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;
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(&val, 0, sizeof val);
r = cursor->c_get(cursor, &key, &val, DB_FIRST);
if (r == 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
assert(r == DB_NOTFOUND);
r = cursor->c_close(cursor); assert(r == 0);
CKERR2(r, DB_NOTFOUND);
r = cursor->c_close(cursor); CKERR(r);
r = txn->commit(txn, 0);
r = db->close(db, 0); assert(r == 0);
r = env->close(env, 0); assert(r == 0);
r = db->close(db, 0); CKERR(r);
r = env->close(env, 0); CKERR(r);
}
int main(int argc, char *argv[]) {
int i;
for (i = 1; i < argc; i++) {
char *arg = argv[i];
if (strcmp(arg, "-v") == 0 || strcmp(arg, "--verbose") == 0) {
verbose++;
continue;
}
}
int main(int argc, const char *argv[]) {
parse_args(argc, argv);
test_txn_abort();
return 0;
}

62
src/tests/test_txn_nested_abort3.c
View File

@ -19,38 +19,37 @@ void test_txn_abort() {
DB_TXN* txn_all = NULL;
DB_TXN* txn_stmt = 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_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);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
assert(r == 0);
r = env->open(env, 0, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, 0777);
CKERR(r);
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;
r = db_create(&db, env, 0); assert(r == 0);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); assert(r == 0);
r = txn->commit(txn, 0); assert(r == 0);
DB *db;
r = db_create(&db, env, 0); CKERR(r);
r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, 0777); CKERR(r);
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;
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));
assert(r == 0);
CKERR(r);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
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);
if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
assert(r == 0);
CKERR(r);
r = txn_stmt->commit(txn_stmt,DB_TXN_NOSYNC);
@ -58,35 +57,26 @@ void test_txn_abort() {
r = txn_all->abort(txn_all);
if (r != 0) printf("%s:%d:abort:%d\n", __FILE__, __LINE__, r);
assert (r==0);
CKERR(r);
/* 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;
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(&val, 0, sizeof val);
r = cursor->c_get(cursor, &key, &val, DB_FIRST);
if (r == 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
assert(r == DB_NOTFOUND);
r = cursor->c_close(cursor); assert(r == 0);
CKERR2(r, DB_NOTFOUND);
r = cursor->c_close(cursor); CKERR(r);
r = txn->commit(txn, 0);
r = db->close(db, 0); assert(r == 0);
r = env->close(env, 0); assert(r == 0);
r = db->close(db, 0); CKERR(r);
r = env->close(env, 0); CKERR(r);
}
int main(int argc, char *argv[]) {
int i;
for (i = 1; i < argc; i++) {
char *arg = argv[i];
if (strcmp(arg, "-v") == 0 || strcmp(arg, "--verbose") == 0) {
verbose++;
continue;
}
}
int main(int argc, const char *argv[]) {
parse_args(argc, argv);
test_txn_abort();
return 0;
}
Write Preview
Loading…
Cancel
Save