ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 18:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-test: refine 'append' testcast (minor).

Browse Source 
Change-Id: I79ea16046713a085e62e01eeb0978fc4e6766750
This commit is contained in:
Leonid Yuriev 2019-06-22 13:13:15 +03:00
parent 3fc610f860
commit 243b01dd63
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/append.cc
View File

@ -19,9 +19,7 @@ bool testcase_append::run() {
txn_begin(false); txn_begin(false);
MDBX_dbi dbi = db_table_open(true); MDBX_dbi dbi = db_table_open(true);
int rc = mdbx_drop(txn_guard.get(), dbi, false); db_table_clear(dbi);
if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_drop(delete=false)", rc);
keyvalue_maker.setup(config.params, config.actor_id, 0 /* thread_number */); keyvalue_maker.setup(config.params, config.actor_id, 0 /* thread_number */);
/* LY: тест наполнения таблиц в append-режиме, /* LY: тест наполнения таблиц в append-режиме,
@ -59,10 +57,10 @@ bool testcase_append::run() {
if (cmp == 0 && (config.params.table_flags & MDBX_DUPSORT)) if (cmp == 0 && (config.params.table_flags & MDBX_DUPSORT))
cmp = mdbx_dcmp(txn_guard.get(), dbi, &data->value, &last_data->value); cmp = mdbx_dcmp(txn_guard.get(), dbi, &data->value, &last_data->value);
rc = mdbx_put(txn_guard.get(), dbi, &key->value, &data->value, flags); int err = mdbx_put(txn_guard.get(), dbi, &key->value, &data->value, flags);
if (cmp > 0) { if (cmp > 0) {
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
failure_perror("mdbx_put(appenda-a)", rc); failure_perror("mdbx_put(appenda-a)", err);
memcpy(last_key->value.iov_base, key->value.iov_base, memcpy(last_key->value.iov_base, key->value.iov_base,
last_key->value.iov_len = key->value.iov_len); last_key->value.iov_len = key->value.iov_len);
memcpy(last_data->value.iov_base, data->value.iov_base, memcpy(last_data->value.iov_base, data->value.iov_base,
@ -71,8 +69,8 @@ bool testcase_append::run() {
inserted_checksum.push((uint32_t)inserted_number, key->value); inserted_checksum.push((uint32_t)inserted_number, key->value);
inserted_checksum.push(10639, data->value); inserted_checksum.push(10639, data->value);
} else { } else {
if (unlikely(rc != MDBX_EKEYMISMATCH)) if (unlikely(err != MDBX_EKEYMISMATCH))
failure_perror("mdbx_put(appenda-a) != MDBX_EKEYMISMATCH", rc); failure_perror("mdbx_put(appenda-a) != MDBX_EKEYMISMATCH", err);
} }
if (++txn_nops >= config.params.batch_write) { if (++txn_nops >= config.params.batch_write) {
@ -88,23 +86,24 @@ bool testcase_append::run() {
cursor_open(dbi); cursor_open(dbi);
MDBX_val check_key, check_data; MDBX_val check_key, check_data;
rc = mdbx_cursor_get(cursor_guard.get(), &check_key, &check_data, MDBX_FIRST); int err =
if (unlikely(rc != MDBX_SUCCESS)) mdbx_cursor_get(cursor_guard.get(), &check_key, &check_data, MDBX_FIRST);
failure_perror("mdbx_cursor_get(MDBX_FIRST)", rc); if (unlikely(err != MDBX_SUCCESS))
failure_perror("mdbx_cursor_get(MDBX_FIRST)", err);
simple_checksum read_checksum; simple_checksum read_checksum;
uint64_t read_count = 0; uint64_t read_count = 0;
while (rc == MDBX_SUCCESS) { while (err == MDBX_SUCCESS) {
++read_count; ++read_count;
read_checksum.push((uint32_t)read_count, check_key); read_checksum.push((uint32_t)read_count, check_key);
read_checksum.push(10639, check_data); read_checksum.push(10639, check_data);
rc = err =
mdbx_cursor_get(cursor_guard.get(), &check_key, &check_data, MDBX_NEXT); mdbx_cursor_get(cursor_guard.get(), &check_key, &check_data, MDBX_NEXT);
} }
if (unlikely(rc != MDBX_NOTFOUND)) if (unlikely(err != MDBX_NOTFOUND))
failure_perror("mdbx_cursor_get(MDBX_NEXT) != EOF", rc); failure_perror("mdbx_cursor_get(MDBX_NEXT) != EOF", err);
if (unlikely(read_count != inserted_number)) if (unlikely(read_count != inserted_number))
failure("read_count(%" PRIu64 ") != inserted_number(%" PRIu64 ")", failure("read_count(%" PRIu64 ") != inserted_number(%" PRIu64 ")",

8
test/test.cc
View File

@ -432,6 +432,14 @@ void testcase::db_table_drop(MDBX_dbi handle) {
} }
} }
void testcase::db_table_clear(MDBX_dbi handle) {
log_trace(">> testcase::db_table_clear, handle %u", handle);
int rc = mdbx_drop(txn_guard.get(), handle, false);
if (unlikely(rc != MDBX_SUCCESS))
failure_perror("mdbx_drop(delete=false)", rc);
log_trace("<< testcase::db_table_clear");
}
void testcase::db_table_close(MDBX_dbi handle) { void testcase::db_table_close(MDBX_dbi handle) {
log_trace(">> testcase::db_table_close, handle %u", handle); log_trace(">> testcase::db_table_close, handle %u", handle);
assert(!txn_guard); assert(!txn_guard);

1
test/test.h
View File

@ -119,6 +119,7 @@ protected:
MDBX_dbi db_table_open(bool create); MDBX_dbi db_table_open(bool create);
void db_table_drop(MDBX_dbi handle); void db_table_drop(MDBX_dbi handle);
void db_table_clear(MDBX_dbi handle);
void db_table_close(MDBX_dbi handle); void db_table_close(MDBX_dbi handle);
bool wait4start(); bool wait4start();