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

mdbx-tools: cleanup/refine mdbx_dump & mdbx_load.

Browse Source
This commit is contained in:
Leonid Yuriev 2020-10-27 01:08:01 +03:00
parent 2120e396fc
commit faddc71eac
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mdbx_dump.c
View File

@ -209,6 +209,8 @@ static int dump_sdb(MDBX_txn *txn, MDBX_dbi dbi, char *name) {
rc = MDBX_SUCCESS; rc = MDBX_SUCCESS;
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
error("mdbx_cursor_get", rc); error("mdbx_cursor_get", rc);
mdbx_cursor_close(cursor);
return rc; return rc;
} }
@ -243,7 +245,7 @@ int main(int argc, char *argv[]) {
MDBX_dbi dbi; MDBX_dbi dbi;
prog = argv[0]; prog = argv[0];
char *envname; char *envname;
char *subname = nullptr; char *subname = nullptr, *buf4free = nullptr;
unsigned envflags = 0; unsigned envflags = 0;
bool alldbs = false, list = false; bool alldbs = false, list = false;
@ -389,7 +391,13 @@ int main(int argc, char *argv[]) {
if (memchr(key.iov_base, '\0', key.iov_len)) if (memchr(key.iov_base, '\0', key.iov_len))
continue; continue;
subname = mdbx_malloc(key.iov_len + 1); subname = mdbx_realloc(buf4free, key.iov_len + 1);
if (!subname) {
rc = MDBX_ENOMEM;
break;
}
buf4free = subname;
memcpy(subname, key.iov_base, key.iov_len); memcpy(subname, key.iov_base, key.iov_len);
subname[key.iov_len] = '\0'; subname[key.iov_len] = '\0';
@ -442,7 +450,6 @@ int main(int argc, char *argv[]) {
break; break;
} }
} }
mdbx_free(subname);
} }
mdbx_cursor_close(cursor); mdbx_cursor_close(cursor);
cursor = nullptr; cursor = nullptr;
@ -476,6 +483,7 @@ txn_abort:
mdbx_txn_abort(txn); mdbx_txn_abort(txn);
env_close: env_close:
mdbx_env_close(env); mdbx_env_close(env);
free(buf4free);
return rc ? EXIT_FAILURE : EXIT_SUCCESS; return rc ? EXIT_FAILURE : EXIT_SUCCESS;
} }

67
src/mdbx_load.c
View File

@ -118,7 +118,6 @@ static MDBX_envinfo envinfo;
static int mode = GLOBAL; static int mode = GLOBAL;
static MDBX_val kbuf, dbuf; static MDBX_val kbuf, dbuf;
static MDBX_val k0buf;
#define STRLENOF(s) (sizeof(s) - 1) #define STRLENOF(s) (sizeof(s) - 1)
@ -481,11 +480,9 @@ int main(int argc, char *argv[]) {
MDBX_cursor *mc = nullptr; MDBX_cursor *mc = nullptr;
MDBX_dbi dbi; MDBX_dbi dbi;
char *envname = nullptr; char *envname = nullptr;
int envflags = MDBX_UTTERLY_NOSYNC, putflags = 0; int envflags = MDBX_UTTERLY_NOSYNC, putflags = MDBX_UPSERT;
bool append = false;
bool quiet = false; bool quiet = false;
bool rescue = false; bool rescue = false;
MDBX_val prevk;
prog = argv[0]; prog = argv[0];
if (argc < 2) if (argc < 2)
@ -508,7 +505,7 @@ int main(int argc, char *argv[]) {
mdbx_build.options); mdbx_build.options);
return EXIT_SUCCESS; return EXIT_SUCCESS;
case 'a': case 'a':
append = true; putflags |= MDBX_APPEND;
break; break;
case 'f': case 'f':
if (freopen(optarg, "r", stdin) == nullptr) { if (freopen(optarg, "r", stdin) == nullptr) {
@ -524,7 +521,7 @@ int main(int argc, char *argv[]) {
subname = mdbx_strdup(optarg); subname = mdbx_strdup(optarg);
break; break;
case 'N': case 'N':
putflags = MDBX_NOOVERWRITE | MDBX_NODUPDATA; putflags |= MDBX_NOOVERWRITE | MDBX_NODUPDATA;
break; break;
case 'T': case 'T':
mode |= NOHDR | PRINT; mode |= NOHDR | PRINT;
@ -565,6 +562,11 @@ int main(int argc, char *argv[]) {
dbuf.iov_len = 4096; dbuf.iov_len = 4096;
dbuf.iov_base = mdbx_malloc(dbuf.iov_len); dbuf.iov_base = mdbx_malloc(dbuf.iov_len);
if (!dbuf.iov_base) {
rc = MDBX_ENOMEM;
error("value-buffer", rc);
goto env_close;
}
/* read first header for mapsize= */ /* read first header for mapsize= */
if (!(mode & NOHDR)) { if (!(mode & NOHDR)) {
@ -625,17 +627,19 @@ int main(int argc, char *argv[]) {
goto env_close; goto env_close;
} }
kbuf.iov_len = mdbx_env_get_maxvalsize_ex(env, MDBX_DUPSORT); kbuf.iov_len = mdbx_env_get_maxvalsize_ex(env, 0) + 1;
if (kbuf.iov_len >= INTPTR_MAX / 4) { if (kbuf.iov_len >= INTPTR_MAX / 2) {
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);
goto env_close; goto env_close;
} }
kbuf.iov_len = (kbuf.iov_len + 1) * 2;
kbuf.iov_base = malloc(kbuf.iov_len * 2); kbuf.iov_base = malloc(kbuf.iov_len);
k0buf.iov_len = kbuf.iov_len; if (!kbuf.iov_base) {
k0buf.iov_base = (char *)kbuf.iov_base + kbuf.iov_len; rc = MDBX_ENOMEM;
prevk.iov_base = k0buf.iov_base; error("key-buffer", rc);
goto env_close;
}
while (rc == MDBX_SUCCESS) { while (rc == MDBX_SUCCESS) {
if (user_break) { if (user_break) {
@ -661,9 +665,10 @@ int main(int argc, char *argv[]) {
} }
const char *const dbi_name = subname ? subname : "@MAIN"; const char *const dbi_name = subname ? subname : "@MAIN";
rc = mdbx_dbi_open_ex(txn, subname, dbi_flags | MDBX_CREATE, &dbi, rc =
append ? equal_or_greater : nullptr, mdbx_dbi_open_ex(txn, subname, dbi_flags | MDBX_CREATE, &dbi,
append ? equal_or_greater : nullptr); (putflags & MDBX_APPEND) ? equal_or_greater : nullptr,
(putflags & MDBX_APPEND) ? equal_or_greater : nullptr);
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_dbi_open_ex", rc); error("mdbx_dbi_open_ex", rc);
goto txn_abort; goto txn_abort;
@ -691,19 +696,17 @@ int main(int argc, char *argv[]) {
} }
} }
if (putflags & MDBX_APPEND)
putflags = (dbi_flags & MDBX_DUPSORT) ? putflags | MDBX_APPENDDUP
: putflags & ~MDBX_APPENDDUP;
rc = mdbx_cursor_open(txn, dbi, &mc); rc = mdbx_cursor_open(txn, dbi, &mc);
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
error("mdbx_cursor_open", rc); error("mdbx_cursor_open", rc);
goto txn_abort; goto txn_abort;
} }
/* if (append) {
mc->mc_flags |= C_SKIPORD;
if (mc->mc_xcursor)
mc->mc_xcursor->mx_cursor.mc_flags |= C_SKIPORD;
} */
int batch = 0; int batch = 0;
prevk.iov_len = 0;
while (rc == MDBX_SUCCESS) { while (rc == MDBX_SUCCESS) {
MDBX_val key, data; MDBX_val key, data;
rc = readline(&key, &kbuf); rc = readline(&key, &kbuf);
@ -718,18 +721,7 @@ int main(int argc, char *argv[]) {
goto txn_abort; goto txn_abort;
} }
int appflag = 0; rc = mdbx_cursor_put(mc, &key, &data, putflags);
if (append) {
appflag = MDBX_APPEND;
if (dbi_flags & MDBX_DUPSORT) {
if (prevk.iov_len == key.iov_len &&
memcmp(prevk.iov_base, key.iov_base, key.iov_len) == 0)
appflag = MDBX_APPEND | MDBX_APPENDDUP;
else
memcpy(prevk.iov_base, key.iov_base, prevk.iov_len = key.iov_len);
}
}
rc = mdbx_cursor_put(mc, &key, &data, putflags | appflag);
if (rc == MDBX_KEYEXIST && putflags) if (rc == MDBX_KEYEXIST && putflags)
continue; continue;
if (rc == MDBX_BAD_VALSIZE && rescue) { if (rc == MDBX_BAD_VALSIZE && rescue) {
@ -770,11 +762,6 @@ int main(int argc, char *argv[]) {
error("mdbx_cursor_open", rc); error("mdbx_cursor_open", rc);
goto txn_abort; goto txn_abort;
} }
/* if (append) {
mc->mc_flags |= C_SKIPORD;
if (mc->mc_xcursor)
mc->mc_xcursor->mx_cursor.mc_flags |= C_SKIPORD;
} */
} }
} }
@ -815,6 +802,8 @@ txn_abort:
mdbx_txn_abort(txn); mdbx_txn_abort(txn);
env_close: env_close:
mdbx_env_close(env); mdbx_env_close(env);
free(kbuf.iov_base);
free(dbuf.iov_base);
return rc ? EXIT_FAILURE : EXIT_SUCCESS; return rc ? EXIT_FAILURE : EXIT_SUCCESS;
} }