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

mdbx: mdb_chk - don't close dbi-handles, set_maxdbs() instead.

Browse Source
This commit is contained in:
Leo Yuriev 2016-12-21 20:29:19 +03:00
parent a866d8b6c2
commit 7e68254051
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mdb_chk.c
View File

@ -432,7 +432,6 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent)
fflush(NULL); fflush(NULL);
} }
skipped_subdb++; skipped_subdb++;
mdbx_dbi_close(env, dbi);
return MDB_SUCCESS; return MDB_SUCCESS;
} }
@ -444,14 +443,12 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent)
rc = mdbx_dbi_flags(txn, dbi, &flags); rc = mdbx_dbi_flags(txn, dbi, &flags);
if (rc) { if (rc) {
error(" - mdbx_dbi_flags failed, error %d %s\n", rc, mdbx_strerror(rc)); error(" - mdbx_dbi_flags failed, error %d %s\n", rc, mdbx_strerror(rc));
mdbx_dbi_close(env, dbi);
return rc; return rc;
} }
rc = mdbx_stat(txn, dbi, &ms, sizeof(ms)); rc = mdbx_stat(txn, dbi, &ms, sizeof(ms));
if (rc) { if (rc) {
error(" - mdbx_stat failed, error %d %s\n", rc, mdbx_strerror(rc)); error(" - mdbx_stat failed, error %d %s\n", rc, mdbx_strerror(rc));
mdbx_dbi_close(env, dbi);
return rc; return rc;
} }
@ -475,7 +472,6 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent)
rc = mdbx_cursor_open(txn, dbi, &mc); rc = mdbx_cursor_open(txn, dbi, &mc);
if (rc) { if (rc) {
error(" - mdbx_cursor_open failed, error %d %s\n", rc, mdbx_strerror(rc)); error(" - mdbx_cursor_open failed, error %d %s\n", rc, mdbx_strerror(rc));
mdbx_dbi_close(env, dbi);
return rc; return rc;
} }
@ -565,7 +561,6 @@ bailout:
} }
mdbx_cursor_close(mc); mdbx_cursor_close(mc);
mdbx_dbi_close(env, dbi);
return rc || problems_count; return rc || problems_count;
} }
@ -686,7 +681,11 @@ int main(int argc, char *argv[])
} }
maxkeysize = rc; maxkeysize = rc;
mdbx_env_set_maxdbs(env, 3); rc = mdbx_env_set_maxdbs(env, MAX_DBI);
if (rc < 0) {
error("mdbx_env_set_maxdbs failed, error %d %s\n", rc, mdbx_strerror(rc));
goto bailout;
}
rc = mdbx_env_open_ex(env, envname, envflags, 0664, &exclusive); rc = mdbx_env_open_ex(env, envname, envflags, 0664, &exclusive);
if (rc) { if (rc) {