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

lmdb: added write-lock mode for mdb_chk.

Browse Source 
Change-Id: I9e28f2153bdcb190c1e4fa502242aa6d4f78787b
This commit is contained in:
Leo Yuriev 2015-08-06 21:52:38 +03:00
parent 0ee96ec09b
commit 59b74d5df0
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mdb_chk.c
View File

@ -63,7 +63,7 @@ size_t pgcount;
size_t total_payload_bytes, total_unused_bytes; size_t total_payload_bytes, total_unused_bytes;
MDB_env *env; MDB_env *env;
MDB_txn *txn; MDB_txn *txn, *locktxn;
MDB_envinfo info; MDB_envinfo info;
MDB_stat stat; MDB_stat stat;
size_t maxkeysize, reclaimable_pages, freedb_pages, lastpgno; size_t maxkeysize, reclaimable_pages, freedb_pages, lastpgno;
@ -453,7 +453,12 @@ bailout:
static void usage(char *prog) static void usage(char *prog)
{ {
fprintf(stderr, "usage: %s dbpath [-V] [-v] [-n] [-q]\n", prog); fprintf(stderr, "usage: %s dbpath [-V] [-v] [-n] [-q] [-w]\n"
" -V\tshow version\n"
" -v\tmore verbose, could be used multiple times\n"
" -n\tNOSUBDIR mode for open\n"
" -q\tbe quiet\n"
" -w\tstart write-txn to lock db\n", prog);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -477,7 +482,7 @@ int main(int argc, char *argv[])
int i, rc; int i, rc;
char *prog = argv[0]; char *prog = argv[0];
char *envname; char *envname;
int envflags = 0; int envflags = MDB_RDONLY;
long problems_maindb = 0, problems_freedb = 0; long problems_maindb = 0, problems_freedb = 0;
int problems_meta = 0; int problems_meta = 0;
size_t n; size_t n;
@ -486,11 +491,7 @@ int main(int argc, char *argv[])
usage(prog); usage(prog);
} }
/* -n: use NOSUBDIR flag on env_open while ((i = getopt(argc, argv, "Vvqnw")) != EOF) {
* -V: print version and exit
* (default) dump only the main DB
*/
while ((i = getopt(argc, argv, "Vvqn")) != EOF) {
switch(i) { switch(i) {
case 'V': case 'V':
printf("%s\n", MDB_VERSION_STRING); printf("%s\n", MDB_VERSION_STRING);
@ -505,6 +506,9 @@ int main(int argc, char *argv[])
case 'n': case 'n':
envflags |= MDB_NOSUBDIR; envflags |= MDB_NOSUBDIR;
break; break;
case 'w':
envflags &= ~MDB_RDONLY;
break;
default: default:
usage(prog); usage(prog);
} }
@ -523,7 +527,8 @@ int main(int argc, char *argv[])
signal(SIGTERM, signal_hanlder); signal(SIGTERM, signal_hanlder);
envname = argv[optind]; envname = argv[optind];
print("Running mdb_chk for '%s'...\n", envname); print("Running mdb_chk for '%s' in %s mode...\n",
envname, (envflags & MDB_RDONLY) ? "read-only" : "write-lock");
rc = mdb_env_create(&env); rc = mdb_env_create(&env);
if (rc) { if (rc) {
@ -540,12 +545,26 @@ int main(int argc, char *argv[])
mdb_env_set_maxdbs(env, 3); mdb_env_set_maxdbs(env, 3);
rc = mdb_env_open(env, envname, envflags | MDB_RDONLY, 0664); rc = mdb_env_open(env, envname, envflags, 0664);
if (rc) { if (rc) {
error("mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc)); error("mdb_env_open failed, error %d %s\n", rc, mdb_strerror(rc));
goto bailout; goto bailout;
} }
rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn);
if (rc) {
error("mdb_txn_begin(read-only) failed, error %d %s\n", rc, mdb_strerror(rc));
goto bailout;
}
if (! (envflags & MDB_RDONLY)) {
rc = mdb_txn_begin(env, NULL, 0, &locktxn);
if (rc) {
error("mdb_txn_begin(lock-write) failed, error %d %s\n", rc, mdb_strerror(rc));
goto bailout;
}
}
rc = mdb_env_info(env, &info); rc = mdb_env_info(env, &info);
if (rc) { if (rc) {
error("mdb_env_info failed, error %d %s\n", rc, mdb_strerror(rc)); error("mdb_env_info failed, error %d %s\n", rc, mdb_strerror(rc));
@ -614,12 +633,6 @@ int main(int argc, char *argv[])
++problems_meta; ++problems_meta;
} }
rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn);
if (rc) {
error("mdb_txn_begin failed, error %d %s\n", rc, mdb_strerror(rc));
goto bailout;
}
print("Walking b-tree...\n"); print("Walking b-tree...\n");
rc = mdb_env_pgwalk(txn, pgvisitor, NULL); rc = mdb_env_pgwalk(txn, pgvisitor, NULL);
if (rc) { if (rc) {
@ -700,6 +713,8 @@ int main(int argc, char *argv[])
process_db(-1, NULL, handle_maindb, 1); process_db(-1, NULL, handle_maindb, 1);
mdb_txn_abort(txn); mdb_txn_abort(txn);
if (locktxn)
mdb_txn_abort(locktxn);
if (! userdb_count && verbose) if (! userdb_count && verbose)
print("%s: %s does not contain multiple databases\n", prog, envname); print("%s: %s does not contain multiple databases\n", prog, envname);