ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 17:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-tools: ускорение работы mdbx_chk при обработке пользовательских записей в @MAIN.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-12-11 16:46:20 +03:00
parent 1c93cff825
commit 0884f28f85
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mdbx_chk.c
View File

@ -620,6 +620,8 @@ static int handle_maindb(const uint64_t record_number, const MDBX_val *key,
int rc; int rc;
size_t i; size_t i;
if (data->iov_len != sizeof(MDBX_db))
return handle_userdb(record_number, key, data);
name = key->iov_base; name = key->iov_base;
for (i = 0; i < key->iov_len; ++i) { for (i = 0; i < key->iov_len; ++i) {
if (name[i] < ' ') if (name[i] < ' ')
@ -631,12 +633,13 @@ static int handle_maindb(const uint64_t record_number, const MDBX_val *key,
return MDBX_ENOMEM; return MDBX_ENOMEM;
memcpy(name, key->iov_base, key->iov_len); memcpy(name, key->iov_base, key->iov_len);
name[key->iov_len] = '\0'; name[key->iov_len] = '\0';
userdb_count++;
rc = process_db(~0u, name, handle_userdb, false); rc = process_db(~0u, name, handle_userdb, false);
osal_free(name); osal_free(name);
if (rc != MDBX_INCOMPATIBLE) if (rc != MDBX_INCOMPATIBLE) {
userdb_count++;
return rc; return rc;
}
return handle_userdb(record_number, key, data); return handle_userdb(record_number, key, data);
} }
@ -737,10 +740,9 @@ static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler,
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
if (!silent && verbose) { if (!silent && verbose)
print("Processing '%s'...\n", dbi_name ? dbi_name : "@MAIN"); print("Processing '%s'...\n", dbi_name ? dbi_name : "@MAIN");
fflush(nullptr); fflush(nullptr);
}
rc = mdbx_dbi_flags(txn, dbi_handle, &flags); rc = mdbx_dbi_flags(txn, dbi_handle, &flags);
if (rc) { if (rc) {
@ -1639,15 +1641,6 @@ int main(int argc, char *argv[]) {
fflush(nullptr); fflush(nullptr);
} }
if (!verbose)
print("Iterating DBIs...\n");
if (data_tree_problems) {
print("Skip processing %s since tree is corrupted (%u problems)\n", "@MAIN",
data_tree_problems);
problems_maindb = data_tree_problems;
} else
problems_maindb = process_db(~0u, /* MAIN_DBI */ nullptr, nullptr, false);
if (gc_tree_problems) { if (gc_tree_problems) {
print("Skip processing %s since tree is corrupted (%u problems)\n", "@GC", print("Skip processing %s since tree is corrupted (%u problems)\n", "@GC",
gc_tree_problems); gc_tree_problems);
@ -1685,7 +1678,7 @@ int main(int argc, char *argv[]) {
print(", available %" PRIu64 " (%.1f%%)\n", value, value / percent); print(", available %" PRIu64 " (%.1f%%)\n", value, value / percent);
} }
if (problems_maindb == 0 && problems_freedb == 0) { if ((problems_maindb = data_tree_problems) == 0 && problems_freedb == 0) {
if (!dont_traversal && if (!dont_traversal &&
(envflags & (MDBX_EXCLUSIVE | MDBX_RDONLY)) != MDBX_RDONLY) { (envflags & (MDBX_EXCLUSIVE | MDBX_RDONLY)) != MDBX_RDONLY) {
if (walk.pgcount != alloc_pages - gc_pages) { if (walk.pgcount != alloc_pages - gc_pages) {
@ -1702,10 +1695,20 @@ int main(int argc, char *argv[]) {
"monopolistic or read-write mode only)\n"); "monopolistic or read-write mode only)\n");
} }
if (!process_db(MAIN_DBI, nullptr, handle_maindb, true)) { problems_maindb = process_db(~0u, /* MAIN_DBI */ nullptr, nullptr, false);
if (!userdb_count && verbose) if (problems_maindb == 0) {
print(" - does not contain multiple databases\n"); print("Scanning %s for %s...\n", "@MAIN", "sub-database(s)");
if (!process_db(MAIN_DBI, nullptr, handle_maindb, true)) {
if (!userdb_count && verbose)
print(" - does not contain multiple databases\n");
}
} else {
print("Skip processing %s since %s is corrupted (%u problems)\n",
"sub-database(s)", "@MAIN", problems_maindb);
} }
} else {
print("Skip processing %s since %s is corrupted (%u problems)\n", "@MAIN",
"tree", data_tree_problems);
} }
if (rc == 0 && total_problems == 1 && problems_meta == 1 && !dont_traversal && if (rc == 0 && total_problems == 1 && problems_meta == 1 && !dont_traversal &&