ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-05 12:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: more spelling.

Browse Source 
Change-Id: I45e42c1d8ef51f910b8e41279b92e54a6b2ce772
This commit is contained in:
Leonid Yuriev
2020-10-20 15:42:50 +03:00
parent 603e250745
commit b964b2abf5
15 changed files with 91 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/append.cc
View File

@@ -43,8 +43,8 @@ bool testcase_append::run() {
uint64_t serial_count = 0;
unsigned txn_nops = 0;
uint64_t commited_inserted_number = inserted_number;
simple_checksum commited_inserted_checksum = inserted_checksum;
uint64_t committed_inserted_number = inserted_number;
simple_checksum committed_inserted_checksum = inserted_checksum;
while (should_continue()) {
const keygen::serial_t serial = serial_count;
if (!keyvalue_maker.increment(serial_count, 1)) {
@@ -64,8 +64,8 @@ bool testcase_append::run() {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("append: bailout-insert due '%s'", mdbx_strerror(err));
txn_end(true);
inserted_number = commited_inserted_number;
inserted_checksum = commited_inserted_checksum;
inserted_number = committed_inserted_number;
inserted_checksum = committed_inserted_checksum;
break;
}
@@ -89,12 +89,12 @@ bool testcase_append::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("append: bailout-commit due '%s'", mdbx_strerror(err));
inserted_number = commited_inserted_number;
inserted_checksum = commited_inserted_checksum;
inserted_number = committed_inserted_number;
inserted_checksum = committed_inserted_checksum;
break;
}
commited_inserted_number = inserted_number;
commited_inserted_checksum = inserted_checksum;
committed_inserted_number = inserted_number;
committed_inserted_checksum = inserted_checksum;
txn_nops = 0;
}
@@ -105,8 +105,8 @@ bool testcase_append::run() {
err = breakable_commit();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("append: bailout-commit due '%s'", mdbx_strerror(err));
inserted_number = commited_inserted_number;
inserted_checksum = commited_inserted_checksum;
inserted_number = committed_inserted_number;
inserted_checksum = committed_inserted_checksum;
}
}
//----------------------------------------------------------------------------

76
test/hill.cc
View File

@@ -21,7 +21,7 @@ bool testcase_hill::run() {
return false;
}
speculum.clear();
speculum_commited.clear();
speculum_committed.clear();
/* LY: тест "холмиком":
* - сначала наполняем таблицу циклическими CRUD-манипуляциями,
@@ -62,7 +62,7 @@ bool testcase_hill::run() {
: MDBX_NODUPDATA;
uint64_t serial_count = 0;
uint64_t commited_serial = serial_count;
uint64_t committed_serial = serial_count;
unsigned txn_nops = 0;
bool rc = false;
@@ -87,8 +87,8 @@ bool testcase_hill::run() {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("uphill: bailout at insert-a due '%s'", mdbx_strerror(err));
txn_restart(true, false);
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_put(insert-a.1)", err);
@@ -102,12 +102,12 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("uphill: bailout at commit due '%s'", mdbx_strerror(err));
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
commited_serial = a_serial;
speculum_committed = speculum;
committed_serial = a_serial;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("uphill: bailout after insert-a, after commit");
@@ -123,8 +123,8 @@ bool testcase_hill::run() {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("uphill: bailout at insert-b due '%s'", mdbx_strerror(err));
txn_restart(true, false);
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_put(insert-b)", err);
@@ -138,12 +138,12 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("uphill: bailout at commit due '%s'", mdbx_strerror(err));
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
commited_serial = a_serial;
speculum_committed = speculum;
committed_serial = a_serial;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("uphill: bailout after insert-b, after commit");
@@ -161,8 +161,8 @@ bool testcase_hill::run() {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("uphill: bailout at update-a due '%s'", mdbx_strerror(err));
txn_restart(true, false);
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_replace(update-a: 1->0)", err);
@@ -176,12 +176,12 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("uphill: bailout at commit due '%s'", mdbx_strerror(err));
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
commited_serial = a_serial;
speculum_committed = speculum;
committed_serial = a_serial;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("uphill: bailout after update-a, after commit");
@@ -197,8 +197,8 @@ bool testcase_hill::run() {
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
log_notice("uphill: bailout at delete-b due '%s'", mdbx_strerror(err));
txn_restart(true, false);
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_del(b)", err);
@@ -212,12 +212,12 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("uphill: bailout at commit due '%s'", mdbx_strerror(err));
serial_count = commited_serial;
speculum = speculum_commited;
serial_count = committed_serial;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
commited_serial = a_serial;
speculum_committed = speculum;
committed_serial = a_serial;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("uphill: bailout after delete-b, after commit");
@@ -296,7 +296,7 @@ bool testcase_hill::run() {
log_notice("downhill: bailout at update-a due '%s'",
mdbx_strerror(err));
txn_end(true);
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_put(update-a: 0->1)", err);
@@ -310,10 +310,10 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("downhill: bailout at commit due '%s'", mdbx_strerror(err));
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
speculum_committed = speculum;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("downhill: bailout after update-a, after commit");
@@ -330,7 +330,7 @@ bool testcase_hill::run() {
log_notice("downhill: bailout at insert-a due '%s'",
mdbx_strerror(err));
txn_end(true);
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_put(insert-b)", err);
@@ -344,10 +344,10 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("downhill: bailout at commit due '%s'", mdbx_strerror(err));
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
speculum_committed = speculum;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("downhill: bailout after insert-b, after commit");
@@ -365,7 +365,7 @@ bool testcase_hill::run() {
log_notice("downhill: bailout at delete-a due '%s'",
mdbx_strerror(err));
txn_end(true);
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_del(a)", err);
@@ -379,10 +379,10 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("downhill: bailout at commit due '%s'", mdbx_strerror(err));
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
speculum_committed = speculum;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("downhill: bailout after delete-a, after commit");
@@ -399,7 +399,7 @@ bool testcase_hill::run() {
log_notice("downhill: bailout at delete-b due '%s'",
mdbx_strerror(err));
txn_end(true);
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
failure_perror("mdbx_del(b)", err);
@@ -413,10 +413,10 @@ bool testcase_hill::run() {
err = breakable_restart();
if (unlikely(err != MDBX_SUCCESS)) {
log_notice("downhill: bailout at commit due '%s'", mdbx_strerror(err));
speculum = speculum_commited;
speculum = speculum_committed;
break;
}
speculum_commited = speculum;
speculum_committed = speculum;
txn_nops = 0;
if (!speculum_verify()) {
log_notice("downhill: bailout after delete-b, after commit");

6
test/nested.cc
View File

@@ -92,7 +92,7 @@ bool testcase_nested::pop_txn(bool abort) {
assert(txn_guard && !stack.empty());
bool should_continue = true;
MDBX_txn *txn = txn_guard.release();
bool commited = false;
bool committed = false;
if (abort) {
log_verbose(
"abort level#%zu txn #%" PRIu64 ", undo serial %" PRIu64 " <- %" PRIu64,
@@ -105,7 +105,7 @@ bool testcase_nested::pop_txn(bool abort) {
stack.size(), serial, std::get<1>(stack.top()));
int err = mdbx_txn_commit(txn);
if (likely(err == MDBX_SUCCESS))
commited = true;
committed = true;
else {
should_continue = false;
if (err == MDBX_MAP_FULL && config.params.ignore_dbfull) {
@@ -119,7 +119,7 @@ bool testcase_nested::pop_txn(bool abort) {
}
std::swap(txn_guard, std::get<0>(stack.top()));
if (!commited) {
if (!committed) {
serial = std::get<1>(stack.top());
std::swap(fifo, std::get<2>(stack.top()));
std::swap(speculum, std::get<3>(stack.top()));

2
test/osal-unix.cc
View File

@@ -164,7 +164,7 @@ void osal_setup(const std::vector<actor_config> &actors) {
,
-1, 0);
if (MAP_FAILED == (void *)shared)
failure_perror("mmap(shared_conds)", errno);
failure_perror("mmap(shared)", errno);
shared->count = actors.size() + 1;

14
test/test.cc
View File

@@ -207,9 +207,9 @@ int testcase::breakable_commit() {
if (need_speculum_assign) {
need_speculum_assign = false;
if (unlikely(rc != MDBX_SUCCESS))
speculum = speculum_commited;
speculum = speculum_committed;
else
speculum_commited = speculum;
speculum_committed = speculum;
}
log_trace("<< txn_commit: %s", rc ? "failed" : "Ok");
@@ -240,14 +240,14 @@ void testcase::txn_end(bool abort) {
if (unlikely(err != MDBX_SUCCESS))
failure_perror("mdbx_txn_abort()", err);
if (need_speculum_assign)
speculum = speculum_commited;
speculum = speculum_committed;
} else {
txn_inject_writefault(txn);
int err = mdbx_txn_commit(txn);
if (unlikely(err != MDBX_SUCCESS))
failure_perror("mdbx_txn_commit()", err);
if (need_speculum_assign)
speculum_commited = speculum;
speculum_committed = speculum;
}
log_trace("<< txn_end(%s)", abort ? "abort" : "commit");
@@ -615,13 +615,13 @@ bool test_execute(const actor_config &config_const) {
}
if (config.params.nrepeat == 1)
log_verbose("test successed");
log_verbose("test successfully");
else {
if (config.params.nrepeat)
log_verbose("test successed (iteration %zi of %zi)", iter,
log_verbose("test successfully (iteration %zi of %zi)", iter,
size_t(config.params.nrepeat));
else
log_verbose("test successed (iteration %zi)", iter);
log_verbose("test successfully (iteration %zi)", iter);
config.params.keygen.seed += INT32_C(0xA4F4D37B);
}

2
test/test.h
View File

@@ -158,7 +158,7 @@ protected:
MDBX_canary canary;
} last;
SET speculum{ItemCompare(this)}, speculum_commited{ItemCompare(this)};
SET speculum{ItemCompare(this)}, speculum_committed{ItemCompare(this)};
bool speculum_verify();
int insert(const keygen::buffer &akey, const keygen::buffer &adata,
MDBX_put_flags_t flags);