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

mdbx-tools: cleanup tools from deprecated API.

Browse Source 
Change-Id: Id1c64edfa7a470ad76f0499d1f58ec482458f8d6
This commit is contained in:
Leonid Yuriev 2019-11-30 00:31:16 +03:00
parent d83de5bd09
commit ed9d1a1542
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/core.c
View File

@ -8112,7 +8112,7 @@ static int __cold mdbx_setup_dxb(MDBX_env *env, const int lck_rc) {
if (!env->me_dbgeo.now) { if (!env->me_dbgeo.now) {
/* set defaults if not configured */ /* set defaults if not configured */
err = mdbx_env_set_mapsize(env, DEFAULT_MAPSIZE); err = mdbx_env_set_geometry(env, 0, -1, DEFAULT_MAPSIZE, -1, -1, -1);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
} }

4
src/tools/mdbx_dump.c
View File

@ -115,7 +115,7 @@ static int dumpit(MDBX_txn *txn, MDBX_dbi dbi, char *name) {
if (rc) if (rc)
return rc; return rc;
rc = mdbx_env_info(mdbx_txn_env(txn), &info, sizeof(info)); rc = mdbx_env_info_ex(mdbx_txn_env(txn), txn, &info, sizeof(info));
if (rc) if (rc)
return rc; return rc;
@ -124,7 +124,7 @@ static int dumpit(MDBX_txn *txn, MDBX_dbi dbi, char *name) {
if (name) if (name)
printf("database=%s\n", name); printf("database=%s\n", name);
printf("type=btree\n"); printf("type=btree\n");
printf("mapsize=%" PRIu64 "\n", info.mi_mapsize); printf("mapsize=%" PRIu64 "\n", info.mi_geo.upper);
printf("maxreaders=%u\n", info.mi_maxreaders); printf("maxreaders=%u\n", info.mi_maxreaders);
for (i = 0; dbflags[i].bit; i++) for (i = 0; dbflags[i].bit; i++)

10
src/tools/mdbx_load.c
View File

@ -442,7 +442,13 @@ int main(int argc, char *argv[]) {
mdbx_strerror(MDBX_TOO_LARGE)); mdbx_strerror(MDBX_TOO_LARGE));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
mdbx_env_set_mapsize(env, (size_t)envinfo.mi_mapsize); rc = mdbx_env_set_geometry(env, 0, -1, (size_t)envinfo.mi_mapsize, -1, -1,
-1);
if (rc) {
fprintf(stderr, "mdbx_env_set_geometry failed, error %d %s\n", rc,
mdbx_strerror(rc));
goto env_close;
}
} }
#ifdef MDBX_FIXEDMAP #ifdef MDBX_FIXEDMAP
@ -457,7 +463,7 @@ int main(int argc, char *argv[]) {
goto env_close; goto env_close;
} }
kbuf.iov_len = mdbx_env_get_maxkeysize(env); kbuf.iov_len = mdbx_env_get_maxvalsize_ex(env, MDBX_DUPSORT);
if (kbuf.iov_len >= SIZE_MAX / 4) { if (kbuf.iov_len >= SIZE_MAX / 4) {
fprintf(stderr, "mdbx_env_get_maxkeysize failed, returns %zu\n", fprintf(stderr, "mdbx_env_get_maxkeysize failed, returns %zu\n",
kbuf.iov_len); kbuf.iov_len);

18
src/tools/mdbx_stat.c
View File

@ -186,15 +186,22 @@ int main(int argc, char *argv[]) {
goto env_close; goto env_close;
} }
rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn);
if (rc) {
fprintf(stderr, "mdbx_txn_begin failed, error %d %s\n", rc,
mdbx_strerror(rc));
goto env_close;
}
if (envinfo || freinfo) { if (envinfo || freinfo) {
(void)mdbx_env_info(env, &mei, sizeof(mei)); (void)mdbx_env_info_ex(env, txn, &mei, sizeof(mei));
} else { } else {
/* LY: zap warnings from gcc */ /* LY: zap warnings from gcc */
memset(&mei, 0, sizeof(mei)); memset(&mei, 0, sizeof(mei));
} }
if (envinfo) { if (envinfo) {
(void)mdbx_env_stat(env, &mst, sizeof(mst)); (void)mdbx_env_stat_ex(env, txn, &mst, sizeof(mst));
printf("Environment Info\n"); printf("Environment Info\n");
printf(" Pagesize: %u\n", mst.ms_psize); printf(" Pagesize: %u\n", mst.ms_psize);
if (mei.mi_geo.lower != mei.mi_geo.upper) { if (mei.mi_geo.lower != mei.mi_geo.upper) {
@ -249,13 +256,6 @@ int main(int argc, char *argv[]) {
goto env_close; goto env_close;
} }
rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn);
if (rc) {
fprintf(stderr, "mdbx_txn_begin failed, error %d %s\n", rc,
mdbx_strerror(rc));
goto env_close;
}
if (freinfo) { if (freinfo) {
MDBX_cursor *cursor; MDBX_cursor *cursor;
MDBX_val key, data; MDBX_val key, data;