ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-test: fix MSVC warnings (minor).

Browse Source
This commit is contained in:
Leonid Yuriev 2019-10-10 00:57:22 +03:00
parent 95bb371b0d
commit e5bd1a6d6f
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/append.cc
View File

@ -15,7 +15,6 @@
#include "test.h" #include "test.h"
bool testcase_append::run() { bool testcase_append::run() {
MDBX_dbi dbi;
int err = db_open__begin__table_create_open_clean(dbi); int err = db_open__begin__table_create_open_clean(dbi);
if (unlikely(err != MDBX_SUCCESS)) { if (unlikely(err != MDBX_SUCCESS)) {
log_notice("append: bailout-prepare due '%s'", mdbx_strerror(err)); log_notice("append: bailout-prepare due '%s'", mdbx_strerror(err));

14
test/test.cc
View File

@ -232,18 +232,18 @@ void testcase::txn_end(bool abort) {
log_trace("<< txn_end(%s)", abort ? "abort" : "commit"); log_trace("<< txn_end(%s)", abort ? "abort" : "commit");
} }
void testcase::cursor_open(unsigned dbi) { void testcase::cursor_open(MDBX_dbi handle) {
log_trace(">> cursor_open(%u)", dbi); log_trace(">> cursor_open(%u)", handle);
assert(!cursor_guard); assert(!cursor_guard);
assert(txn_guard); assert(txn_guard);
MDBX_cursor *cursor = nullptr; MDBX_cursor *cursor = nullptr;
int rc = mdbx_cursor_open(txn_guard.get(), dbi, &cursor); int rc = mdbx_cursor_open(txn_guard.get(), handle, &cursor);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_cursor_open()", rc); failure_perror("mdbx_cursor_open()", rc);
cursor_guard.reset(cursor); cursor_guard.reset(cursor);
log_trace("<< cursor_open(%u)", dbi); log_trace("<< cursor_open(%u)", handle);
} }
void testcase::cursor_close() { void testcase::cursor_close() {
@ -435,14 +435,14 @@ void testcase::update_canary(uint64_t increment) {
log_trace("<< update_canary: sequence = %" PRIu64, canary_now.y); log_trace("<< update_canary: sequence = %" PRIu64, canary_now.y);
} }
int testcase::db_open__begin__table_create_open_clean(MDBX_dbi &dbi) { int testcase::db_open__begin__table_create_open_clean(MDBX_dbi &handle) {
db_open(); db_open();
int err, retry_left = 42; int err, retry_left = 42;
for (;;) { for (;;) {
txn_begin(false); txn_begin(false);
dbi = db_table_open(true); handle = db_table_open(true);
db_table_clear(dbi); db_table_clear(handle);
err = breakable_commit(); err = breakable_commit();
if (likely(err == MDBX_SUCCESS)) { if (likely(err == MDBX_SUCCESS)) {
txn_begin(false); txn_begin(false);

4
test/test.h
View File

@ -175,7 +175,7 @@ protected:
void txn_end(bool abort); void txn_end(bool abort);
int breakable_restart(); int breakable_restart();
void txn_restart(bool abort, bool readonly, unsigned flags = 0); void txn_restart(bool abort, bool readonly, unsigned flags = 0);
void cursor_open(unsigned dbi); void cursor_open(MDBX_dbi handle);
void cursor_close(); void cursor_close();
void txn_inject_writefault(void); void txn_inject_writefault(void);
void txn_inject_writefault(MDBX_txn *txn); void txn_inject_writefault(MDBX_txn *txn);
@ -189,7 +189,7 @@ protected:
void db_table_drop(MDBX_dbi handle); void db_table_drop(MDBX_dbi handle);
void db_table_clear(MDBX_dbi handle, MDBX_txn *txn = nullptr); void db_table_clear(MDBX_dbi handle, MDBX_txn *txn = nullptr);
void db_table_close(MDBX_dbi handle); void db_table_close(MDBX_dbi handle);
int db_open__begin__table_create_open_clean(MDBX_dbi &dbi); int db_open__begin__table_create_open_clean(MDBX_dbi &handle);
bool wait4start(); bool wait4start();
void report(size_t nops_done); void report(size_t nops_done);