summaryrefslogtreecommitdiff
path: root/ft/tests/le-cursor-provdel.cc
diff options
context:
space:
mode:
authorJohn Esmet <esmet@tokutek.com>2012-09-20 21:45:08 +0000
committerYoni Fogel <yoni@tokutek.com>2013-04-17 00:01:08 -0400
commitca73e89ea29c9fa0c73dfbbf7dfdd0bb5718add0 (patch)
tree814dc7f0c4fd0abc550476f945e3abd9fe5a9f41 /ft/tests/le-cursor-provdel.cc
parentc41d7a5f223446d415822125221754a472f458cf (diff)
downloadmariadb-git-ca73e89ea29c9fa0c73dfbbf7dfdd0bb5718add0.tar.gz
fixes #5423 fixes #5424 fixes #5503 fixes #5225 fsync always succeeds and returns void, no more ft panic or logger panic, no more impossible error paths
git-svn-id: file:///svn/toku/tokudb@48076 c7de825b-a66e-492c-adef-691d508d4ae1
Diffstat (limited to 'ft/tests/le-cursor-provdel.cc')
-rw-r--r--ft/tests/le-cursor-provdel.cc26
1 files changed, 10 insertions, 16 deletions
diff --git a/ft/tests/le-cursor-provdel.cc b/ft/tests/le-cursor-provdel.cc
index 1a8372419e0..06821759ee4 100644
--- a/ft/tests/le-cursor-provdel.cc
+++ b/ft/tests/le-cursor-provdel.cc
@@ -44,8 +44,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) {
error = toku_logger_open(logdir, logger);
assert(error == 0);
CACHETABLE ct = NULL;
- error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger);
- assert(error == 0);
+ toku_cachetable_create(&ct, 0, ZERO_LSN, logger);
toku_logger_set_cachetable(logger, ct);
error = toku_logger_open_rollback(logger, ct, true);
assert(error == 0);
@@ -74,7 +73,7 @@ create_populate_tree(const char *logdir, const char *fname, int n) {
toku_fill_dbt(&key, &k, sizeof k);
DBT val;
toku_fill_dbt(&val, &v, sizeof v);
- error = toku_ft_insert(brt, &key, &val, txn);
+ toku_ft_insert(brt, &key, &val, txn);
assert(error == 0);
}
@@ -89,20 +88,18 @@ create_populate_tree(const char *logdir, const char *fname, int n) {
error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT);
assert(error == 0);
- error = toku_logger_close_rollback(logger, false);
+ toku_logger_close_rollback(logger);
assert(error == 0);
error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT);
assert(error == 0);
- error = toku_logger_shutdown(logger);
- CKERR(error);
+ toku_logger_shutdown(logger);
error = toku_logger_close(&logger);
assert(error == 0);
- error = toku_cachetable_close(&ct);
- assert(error == 0);
+ toku_cachetable_close(&ct);
}
// provionally delete all of the even keys
@@ -118,8 +115,7 @@ test_provdel(const char *logdir, const char *fname, int n) {
error = toku_logger_open(logdir, logger);
assert(error == 0);
CACHETABLE ct = NULL;
- error = toku_create_cachetable(&ct, 0, ZERO_LSN, logger);
- assert(error == 0);
+ toku_cachetable_create(&ct, 0, ZERO_LSN, logger);
toku_logger_set_cachetable(logger, ct);
error = toku_logger_open_rollback(logger, ct, false);
assert(error == 0);
@@ -145,7 +141,7 @@ test_provdel(const char *logdir, const char *fname, int n) {
int k = toku_htonl(i);
DBT key;
toku_fill_dbt(&key, &k, sizeof k);
- error = toku_ft_delete(brt, &key, txn);
+ toku_ft_delete(brt, &key, txn);
assert(error == 0);
}
@@ -180,8 +176,7 @@ test_provdel(const char *logdir, const char *fname, int n) {
toku_destroy_dbt(&key);
toku_destroy_dbt(&val);
- error = toku_le_cursor_close(cursor);
- assert(error == 0);
+ toku_le_cursor_close(cursor);
error = toku_txn_commit_txn(cursortxn, true, NULL, NULL);
assert(error == 0);
@@ -197,13 +192,12 @@ test_provdel(const char *logdir, const char *fname, int n) {
error = toku_checkpoint(cp, logger, NULL, NULL, NULL, NULL, CLIENT_CHECKPOINT);
assert(error == 0);
- error = toku_logger_close_rollback(logger, false);
+ toku_logger_close_rollback(logger);
assert(error == 0);
error = toku_logger_close(&logger);
assert(error == 0);
- error = toku_cachetable_close(&ct);
- assert(error == 0);
+ toku_cachetable_close(&ct);
}
static void