mdbx: rename the rest MDBX_xyz.

This commit is contained in:
Leo Yuriev
2017-05-24 01:42:10 +03:00
parent 62ebc59330
commit 06de7a5155
30 changed files with 1993 additions and 1974 deletions

View File

@@ -34,12 +34,12 @@ typedef struct flagbit {
char *name;
} flagbit;
flagbit dbflags[] = {{MDB_DUPSORT, "dupsort"},
{MDB_INTEGERKEY, "integerkey"},
{MDB_REVERSEKEY, "reversekey"},
{MDB_DUPFIXED, "dupfixed"},
{MDB_REVERSEDUP, "reversedup"},
{MDB_INTEGERDUP, "integerdup"},
flagbit dbflags[] = {{MDBX_DUPSORT, "dupsort"},
{MDBX_INTEGERKEY, "integerkey"},
{MDBX_REVERSEKEY, "reversekey"},
{MDBX_DUPFIXED, "dupfixed"},
{MDBX_REVERSEDUP, "reversedup"},
{MDBX_INTEGERDUP, "integerdup"},
{0, NULL}};
static volatile sig_atomic_t gotsignal;
@@ -75,7 +75,7 @@ static __attribute__((constructor)) void init_walk(void) {
uint64_t total_unused_bytes;
int exclusive = 2;
MDB_env *env;
MDBX_env *env;
MDBX_txn *txn, *locktxn;
MDBX_envinfo envinfo;
MDBX_stat envstat;
@@ -298,19 +298,19 @@ static int pgvisitor(uint64_t pgno, unsigned pgnumber, void *ctx,
}
}
return gotsignal ? EINTR : MDB_SUCCESS;
return gotsignal ? EINTR : MDBX_SUCCESS;
}
typedef int(visitor)(const uint64_t record_number, const MDBX_val *key,
const MDBX_val *data);
static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent);
static int process_db(MDBX_dbi dbi, char *name, visitor *handler, int silent);
static int handle_userdb(const uint64_t record_number, const MDBX_val *key,
const MDBX_val *data) {
(void)record_number;
(void)key;
(void)data;
return MDB_SUCCESS;
return MDBX_SUCCESS;
}
static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
@@ -332,7 +332,7 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
data->iov_len);
else {
number = *iptr++;
if (number >= MDB_IDL_UM_MAX)
if (number >= MDBX_IDL_UM_MAX)
problem_add("entry", record_number, "wrong idl length", "%" PRIiPTR "",
number);
else if ((number + 1) * sizeof(pgno_t) != data->iov_len)
@@ -378,7 +378,7 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
}
}
return MDB_SUCCESS;
return MDBX_SUCCESS;
}
static int handle_maindb(const uint64_t record_number, const MDBX_val *key,
@@ -400,14 +400,14 @@ static int handle_maindb(const uint64_t record_number, const MDBX_val *key,
rc = process_db(-1, name, handle_userdb, 0);
free(name);
if (rc != MDB_INCOMPATIBLE)
if (rc != MDBX_INCOMPATIBLE)
return rc;
return handle_userdb(record_number, key, data);
}
static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
MDB_cursor *mc;
static int process_db(MDBX_dbi dbi, char *name, visitor *handler, int silent) {
MDBX_cursor *mc;
MDBX_stat ms;
MDBX_val key, data;
MDBX_val prev_key, prev_data;
@@ -424,7 +424,7 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
if (rc) {
if (!name ||
rc !=
MDB_INCOMPATIBLE) /* LY: mainDB's record is not a user's DB. */ {
MDBX_INCOMPATIBLE) /* LY: mainDB's record is not a user's DB. */ {
error(" - mdbx_open '%s' failed, error %d %s\n", name ? name : "main",
rc, mdbx_strerror(rc));
}
@@ -439,7 +439,7 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
fflush(NULL);
}
skipped_subdb++;
return MDB_SUCCESS;
return MDBX_SUCCESS;
}
if (!silent && verbose) {
@@ -488,8 +488,8 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
saved_list = problems_push();
prev_key.iov_base = NULL;
prev_data.iov_len = 0;
rc = mdbx_cursor_get(mc, &key, &data, MDB_FIRST);
while (rc == MDB_SUCCESS) {
rc = mdbx_cursor_get(mc, &key, &data, MDBX_FIRST);
while (rc == MDBX_SUCCESS) {
if (gotsignal) {
print(" - interrupted by signal\n");
fflush(NULL);
@@ -500,20 +500,20 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
if (key.iov_len > maxkeysize) {
problem_add("entry", record_count, "key length exceeds max-key-size",
"%" PRIuPTR " > %u", key.iov_len, maxkeysize);
} else if ((flags & MDB_INTEGERKEY) && key.iov_len != sizeof(uint64_t) &&
} else if ((flags & MDBX_INTEGERKEY) && key.iov_len != sizeof(uint64_t) &&
key.iov_len != sizeof(uint32_t)) {
problem_add("entry", record_count, "wrong key length",
"%" PRIuPTR " != 4or8", key.iov_len);
}
if ((flags & MDB_INTEGERDUP) && data.iov_len != sizeof(uint64_t) &&
if ((flags & MDBX_INTEGERDUP) && data.iov_len != sizeof(uint64_t) &&
data.iov_len != sizeof(uint32_t)) {
problem_add("entry", record_count, "wrong data length",
"%" PRIuPTR " != 4or8", data.iov_len);
}
if (prev_key.iov_base) {
if ((flags & MDB_DUPFIXED) && prev_data.iov_len != data.iov_len) {
if ((flags & MDBX_DUPFIXED) && prev_data.iov_len != data.iov_len) {
problem_add("entry", record_count, "different data length",
"%" PRIuPTR " != %" PRIuPTR "", prev_data.iov_len,
data.iov_len);
@@ -524,9 +524,9 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
problem_add("entry", record_count, "broken ordering of entries", NULL);
} else if (cmp == 0) {
++dups;
if (!(flags & MDB_DUPSORT))
if (!(flags & MDBX_DUPSORT))
problem_add("entry", record_count, "duplicated entries", NULL);
else if (flags & MDB_INTEGERDUP) {
else if (flags & MDBX_INTEGERDUP) {
cmp = mdbx_dcmp(txn, dbi, &prev_data, &data);
if (cmp > 0)
problem_add("entry", record_count,
@@ -534,9 +534,9 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
}
}
} else if (verbose) {
if (flags & MDB_INTEGERKEY)
if (flags & MDBX_INTEGERKEY)
print(" - fixed key-size %" PRIuPTR "\n", key.iov_len);
if (flags & (MDB_INTEGERDUP | MDB_DUPFIXED))
if (flags & (MDBX_INTEGERDUP | MDBX_DUPFIXED))
print(" - fixed data-size %" PRIuPTR "\n", data.iov_len);
}
@@ -552,9 +552,9 @@ static int process_db(MDB_dbi dbi, char *name, visitor *handler, int silent) {
prev_key = key;
prev_data = data;
rc = mdbx_cursor_get(mc, &key, &data, MDB_NEXT);
rc = mdbx_cursor_get(mc, &key, &data, MDBX_NEXT);
}
if (rc != MDB_NOTFOUND)
if (rc != MDBX_NOTFOUND)
error(" - mdbx_cursor_get failed, error %d %s\n", rc, mdbx_strerror(rc));
else
rc = 0;
@@ -612,7 +612,7 @@ int main(int argc, char *argv[]) {
int i, rc;
char *prog = argv[0];
char *envname;
int envflags = MDB_RDONLY;
int envflags = MDBX_RDONLY;
int problems_maindb = 0, problems_freedb = 0, problems_meta = 0;
int dont_traversal = 0;
struct timespec timestamp_start, timestamp_finish;
@@ -644,10 +644,10 @@ int main(int argc, char *argv[]) {
quiet = 1;
break;
case 'n':
envflags |= MDB_NOSUBDIR;
envflags |= MDBX_NOSUBDIR;
break;
case 'w':
envflags &= ~MDB_RDONLY;
envflags &= ~MDBX_RDONLY;
break;
case 'c':
exclusive = 0;
@@ -679,7 +679,7 @@ int main(int argc, char *argv[]) {
envname = argv[optind];
print("Running mdbx_chk for '%s' in %s mode...\n", envname,
(envflags & MDB_RDONLY) ? "read-only" : "write-lock");
(envflags & MDBX_RDONLY) ? "read-only" : "write-lock");
fflush(NULL);
rc = mdbx_env_create(&env);
@@ -697,14 +697,14 @@ int main(int argc, char *argv[]) {
rc = mdbx_env_open_ex(env, envname, envflags, 0664, &exclusive);
if (rc) {
error("mdbx_env_open failed, error %d %s\n", rc, mdbx_strerror(rc));
if (rc == MDBX_WANNA_RECOVERY && (envflags & MDB_RDONLY))
if (rc == MDBX_WANNA_RECOVERY && (envflags & MDBX_RDONLY))
print("Please run %s in the read-write mode (with '-w' option).\n", prog);
goto bailout;
}
if (verbose)
print(" - %s mode\n", exclusive ? "monopolistic" : "cooperative");
if (!(envflags & MDB_RDONLY)) {
if (!(envflags & MDBX_RDONLY)) {
rc = mdbx_txn_begin(env, NULL, 0, &locktxn);
if (rc) {
error("mdbx_txn_begin(lock-write) failed, error %d %s\n", rc,
@@ -721,7 +721,7 @@ int main(int argc, char *argv[]) {
}
maxkeysize = rc;
rc = mdbx_txn_begin(env, NULL, MDB_RDONLY, &txn);
rc = mdbx_txn_begin(env, NULL, MDBX_RDONLY, &txn);
if (rc) {
error("mdbx_txn_begin(read-only) failed, error %d %s\n", rc,
mdbx_strerror(rc));

View File

@@ -2,9 +2,9 @@
.\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved.
.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.TH MDB_COPY 1 "2014/06/20" "LMDB 0.9.14"
.TH MDBX_COPY 1 "2014/06/20" "LMDB 0.9.14"
.SH NAME
mdbx_copy \- LMDB environment copy tool
mdbx_copy \- MDBX environment copy tool
.SH SYNOPSIS
.B mdbx_copy
[\c
@@ -19,7 +19,7 @@ mdbx_copy \- LMDB environment copy tool
.SH DESCRIPTION
The
.B mdbx_copy
utility copies an LMDB environment. The environment can
utility copies an MDBX environment. The environment can
be copied regardless of whether it is currently in use.
No lockfile is created, since it gets recreated at need.

View File

@@ -23,16 +23,16 @@ static void sighandle(int sig) { (void)sig; }
int main(int argc, char *argv[]) {
int rc;
MDB_env *env = NULL;
MDBX_env *env = NULL;
const char *progname = argv[0], *act;
unsigned flags = MDB_RDONLY;
unsigned flags = MDBX_RDONLY;
unsigned cpflags = 0;
for (; argc > 1 && argv[1][0] == '-'; argc--, argv++) {
if (argv[1][1] == 'n' && argv[1][2] == '\0')
flags |= MDB_NOSUBDIR;
flags |= MDBX_NOSUBDIR;
else if (argv[1][1] == 'c' && argv[1][2] == '\0')
cpflags |= MDB_CP_COMPACT;
cpflags |= MDBX_CP_COMPACT;
else if (argv[1][1] == 'V' && argv[1][2] == '\0') {
printf("%s (%s, build %s)\n", mdbx_version.git.describe,
mdbx_version.git.datetime, mdbx_build.datetime);
@@ -57,10 +57,10 @@ int main(int argc, char *argv[]) {
act = "opening environment";
rc = mdbx_env_create(&env);
if (rc == MDB_SUCCESS) {
if (rc == MDBX_SUCCESS) {
rc = mdbx_env_open(env, argv[1], flags, 0640);
}
if (rc == MDB_SUCCESS) {
if (rc == MDBX_SUCCESS) {
act = "copying";
if (argc == 2)
rc = mdbx_env_copy2fd(env, STDOUT_FILENO, cpflags);

View File

@@ -2,9 +2,9 @@
.\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved.
.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.TH MDB_DUMP 1 "2014/06/20" "LMDB 0.9.14"
.TH MDBX_DUMP 1 "2014/06/20" "LMDB 0.9.14"
.SH NAME
mdbx_dump \- LMDB environment export tool
mdbx_dump \- MDBX environment export tool
.SH SYNOPSIS
.B mdbx_dump
[\c
@@ -42,7 +42,7 @@ List the databases stored in the environment. Just the
names will be listed, no data will be output.
.TP
.BR \-n
Dump an LMDB database which does not use subdirectories.
Dump an MDBX database which does not use subdirectories.
.TP
.BR \-p
If characters in either the key or data items are printing characters (as

View File

@@ -31,12 +31,12 @@ typedef struct flagbit {
char *name;
} flagbit;
flagbit dbflags[] = {{MDB_REVERSEKEY, "reversekey"},
{MDB_DUPSORT, "dupsort"},
{MDB_INTEGERKEY, "integerkey"},
{MDB_DUPFIXED, "dupfixed"},
{MDB_INTEGERDUP, "integerdup"},
{MDB_REVERSEDUP, "reversedup"},
flagbit dbflags[] = {{MDBX_REVERSEKEY, "reversekey"},
{MDBX_DUPSORT, "dupsort"},
{MDBX_INTEGERKEY, "integerkey"},
{MDBX_DUPFIXED, "dupfixed"},
{MDBX_INTEGERDUP, "integerdup"},
{MDBX_REVERSEDUP, "reversedup"},
{0, NULL}};
static volatile sig_atomic_t gotsig;
@@ -84,8 +84,8 @@ static void byte(MDBX_val *v) {
}
/* Dump in BDB-compatible format */
static int dumpit(MDBX_txn *txn, MDB_dbi dbi, char *name) {
MDB_cursor *mc;
static int dumpit(MDBX_txn *txn, MDBX_dbi dbi, char *name) {
MDBX_cursor *mc;
MDBX_stat ms;
MDBX_val key, data;
MDBX_envinfo info;
@@ -125,7 +125,7 @@ static int dumpit(MDBX_txn *txn, MDB_dbi dbi, char *name) {
if (rc)
return rc;
while ((rc = mdbx_cursor_get(mc, &key, &data, MDB_NEXT)) == MDB_SUCCESS) {
while ((rc = mdbx_cursor_get(mc, &key, &data, MDBX_NEXT)) == MDBX_SUCCESS) {
if (gotsig) {
rc = EINTR;
break;
@@ -139,8 +139,8 @@ static int dumpit(MDBX_txn *txn, MDB_dbi dbi, char *name) {
}
}
printf("DATA=END\n");
if (rc == MDB_NOTFOUND)
rc = MDB_SUCCESS;
if (rc == MDBX_NOTFOUND)
rc = MDBX_SUCCESS;
return rc;
}
@@ -154,9 +154,9 @@ static void usage(char *prog) {
int main(int argc, char *argv[]) {
int i, rc;
MDB_env *env;
MDBX_env *env;
MDBX_txn *txn;
MDB_dbi dbi;
MDBX_dbi dbi;
char *prog = argv[0];
char *envname;
char *subname = NULL;
@@ -196,7 +196,7 @@ int main(int argc, char *argv[]) {
}
break;
case 'n':
envflags |= MDB_NOSUBDIR;
envflags |= MDBX_NOSUBDIR;
break;
case 'p':
mode |= PRINT;
@@ -235,14 +235,14 @@ int main(int argc, char *argv[]) {
mdbx_env_set_maxdbs(env, 2);
}
rc = mdbx_env_open(env, envname, envflags | MDB_RDONLY, 0664);
rc = mdbx_env_open(env, envname, envflags | MDBX_RDONLY, 0664);
if (rc) {
fprintf(stderr, "mdbx_env_open failed, error %d %s\n", rc,
mdbx_strerror(rc));
goto env_close;
}
rc = mdbx_txn_begin(env, NULL, MDB_RDONLY, &txn);
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));
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) {
}
if (alldbs) {
MDB_cursor *cursor;
MDBX_cursor *cursor;
MDBX_val key;
int count = 0;
@@ -266,9 +266,9 @@ int main(int argc, char *argv[]) {
mdbx_strerror(rc));
goto txn_abort;
}
while ((rc = mdbx_cursor_get(cursor, &key, NULL, MDB_NEXT_NODUP)) == 0) {
while ((rc = mdbx_cursor_get(cursor, &key, NULL, MDBX_NEXT_NODUP)) == 0) {
char *str;
MDB_dbi db2;
MDBX_dbi db2;
if (memchr(key.iov_base, '\0', key.iov_len))
continue;
count++;
@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
memcpy(str, key.iov_base, key.iov_len);
str[key.iov_len] = '\0';
rc = mdbx_dbi_open(txn, str, 0, &db2);
if (rc == MDB_SUCCESS) {
if (rc == MDBX_SUCCESS) {
if (list) {
printf("%s\n", str);
list++;
@@ -295,15 +295,15 @@ int main(int argc, char *argv[]) {
if (!count) {
fprintf(stderr, "%s: %s does not contain multiple databases\n", prog,
envname);
rc = MDB_NOTFOUND;
} else if (rc == MDB_INCOMPATIBLE) {
rc = MDBX_NOTFOUND;
} else if (rc == MDBX_INCOMPATIBLE) {
/* LY: the record it not a named sub-db. */
rc = MDB_SUCCESS;
rc = MDBX_SUCCESS;
}
} else {
rc = dumpit(txn, dbi, subname);
}
if (rc && rc != MDB_NOTFOUND)
if (rc && rc != MDBX_NOTFOUND)
fprintf(stderr, "%s: %s: %s\n", prog, envname, mdbx_strerror(rc));
mdbx_dbi_close(env, dbi);

View File

@@ -2,9 +2,9 @@
.\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved.
.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.TH MDB_LOAD 1 "2014/06/20" "LMDB 0.9.14"
.TH MDBX_LOAD 1 "2014/06/20" "LMDB 0.9.14"
.SH NAME
mdbx_load \- LMDB environment import tool
mdbx_load \- MDBX environment import tool
.SH SYNOPSIS
.B mdbx_load
[\c
@@ -24,7 +24,7 @@ mdbx_load \- LMDB environment import tool
The
.B mdbx_load
utility reads from the standard input and loads it into the
LMDB environment
MDBX environment
.BR envpath .
The input to
@@ -43,7 +43,7 @@ Write the library version number to the standard output, and exit.
Read from the specified file instead of from the standard input.
.TP
.BR \-n
Load an LMDB database which does not use subdirectories.
Load an MDBX database which does not use subdirectories.
.TP
.BR \-s \ subdb
Load a specific subdatabase. If no database is specified, data is loaded into the main database.

View File

@@ -51,12 +51,12 @@ typedef struct flagbit {
#define S(s) s, STRLENOF(s)
flagbit dbflags[] = {{MDB_REVERSEKEY, S("reversekey")},
{MDB_DUPSORT, S("dupsort")},
{MDB_INTEGERKEY, S("integerkey")},
{MDB_DUPFIXED, S("dupfixed")},
{MDB_INTEGERDUP, S("integerdup")},
{MDB_REVERSEDUP, S("reversedup")},
flagbit dbflags[] = {{MDBX_REVERSEKEY, S("reversekey")},
{MDBX_DUPSORT, S("dupsort")},
{MDBX_INTEGERKEY, S("integerkey")},
{MDBX_DUPFIXED, S("dupfixed")},
{MDBX_INTEGERDUP, S("integerdup")},
{MDBX_REVERSEDUP, S("reversedup")},
{0, NULL, 0}};
static void readhdr(void) {
@@ -294,10 +294,10 @@ static void usage(void) {
int main(int argc, char *argv[]) {
int i, rc;
MDB_env *env;
MDBX_env *env;
MDBX_txn *txn;
MDB_cursor *mc;
MDB_dbi dbi;
MDBX_cursor *mc;
MDBX_dbi dbi;
char *envname;
int envflags = 0, putflags = 0;
@@ -328,13 +328,13 @@ int main(int argc, char *argv[]) {
}
break;
case 'n':
envflags |= MDB_NOSUBDIR;
envflags |= MDBX_NOSUBDIR;
break;
case 's':
subname = strdup(optarg);
break;
case 'N':
putflags = MDB_NOOVERWRITE | MDB_NODUPDATA;
putflags = MDBX_NOOVERWRITE | MDBX_NODUPDATA;
break;
case 'T':
mode |= NOHDR | PRINT;
@@ -369,9 +369,9 @@ int main(int argc, char *argv[]) {
if (envinfo.me_mapsize)
mdbx_env_set_mapsize(env, envinfo.me_mapsize);
#ifdef MDB_FIXEDMAP
#ifdef MDBX_FIXEDMAP
if (info.me_mapaddr)
envflags |= MDB_FIXEDMAP;
envflags |= MDBX_FIXEDMAP;
#endif
rc = mdbx_env_open(env, envname, envflags, 0664);
@@ -395,7 +395,7 @@ int main(int argc, char *argv[]) {
goto env_close;
}
rc = mdbx_dbi_open(txn, subname, dbi_flags | MDB_CREATE, &dbi);
rc = mdbx_dbi_open(txn, subname, dbi_flags | MDBX_CREATE, &dbi);
if (rc) {
fprintf(stderr, "mdbx_open failed, error %d %s\n", rc, mdbx_strerror(rc));
goto txn_abort;
@@ -421,7 +421,7 @@ int main(int argc, char *argv[]) {
}
rc = mdbx_cursor_put(mc, &key, &data, putflags);
if (rc == MDB_KEYEXIST && putflags)
if (rc == MDBX_KEYEXIST && putflags)
continue;
if (rc) {
fprintf(stderr, "mdbx_cursor_put failed, error %d %s\n", rc,

View File

@@ -2,9 +2,9 @@
.\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved.
.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.TH MDB_STAT 1 "2014/06/20" "LMDB 0.9.14"
.TH MDBX_STAT 1 "2014/06/20" "LMDB 0.9.14"
.SH NAME
mdbx_stat \- LMDB environment status tool
mdbx_stat \- MDBX environment status tool
.SH SYNOPSIS
.B mdbx_stat
[\c
@@ -24,7 +24,7 @@ mdbx_stat \- LMDB environment status tool
.SH DESCRIPTION
The
.B mdbx_stat
utility displays the status of an LMDB environment.
utility displays the status of an MDBX environment.
.SH OPTIONS
.TP
.BR \-V
@@ -39,7 +39,7 @@ If \fB\-ff\fP is given, summarize each freelist entry.
If \fB\-fff\fP is given, display the full list of page IDs in the freelist.
.TP
.BR \-n
Display the status of an LMDB database which does not use subdirectories.
Display the status of an MDBX database which does not use subdirectories.
.TP
.BR \-r
Display information about the environment reader table.

View File

@@ -38,9 +38,9 @@ static void usage(char *prog) {
int main(int argc, char *argv[]) {
int i, rc;
MDB_env *env;
MDBX_env *env;
MDBX_txn *txn;
MDB_dbi dbi;
MDBX_dbi dbi;
MDBX_stat mst;
MDBX_envinfo mei;
char *prog = argv[0];
@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
freinfo++;
break;
case 'n':
envflags |= MDB_NOSUBDIR;
envflags |= MDBX_NOSUBDIR;
break;
case 'r':
rdrinfo++;
@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
mdbx_env_set_maxdbs(env, 4);
}
rc = mdbx_env_open(env, envname, envflags | MDB_RDONLY, 0664);
rc = mdbx_env_open(env, envname, envflags | MDBX_RDONLY, 0664);
if (rc) {
fprintf(stderr, "mdbx_env_open failed, error %d %s\n", rc,
mdbx_strerror(rc));
@@ -139,18 +139,18 @@ int main(int argc, char *argv[]) {
if (rdrinfo) {
printf("Reader Table Status\n");
rc = mdbx_reader_list(env, (MDB_msg_func *)fputs, stdout);
rc = mdbx_reader_list(env, (MDBX_msg_func *)fputs, stdout);
if (rdrinfo > 1) {
int dead;
mdbx_reader_check(env, &dead);
printf(" %d stale readers cleared.\n", dead);
rc = mdbx_reader_list(env, (MDB_msg_func *)fputs, stdout);
rc = mdbx_reader_list(env, (MDBX_msg_func *)fputs, stdout);
}
if (!(subname || alldbs || freinfo))
goto env_close;
}
rc = mdbx_txn_begin(env, NULL, MDB_RDONLY, &txn);
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));
@@ -158,7 +158,7 @@ int main(int argc, char *argv[]) {
}
if (freinfo) {
MDB_cursor *cursor;
MDBX_cursor *cursor;
MDBX_val key, data;
size_t pages = 0, *iptr;
size_t reclaimable = 0;
@@ -178,7 +178,7 @@ int main(int argc, char *argv[]) {
goto txn_abort;
}
prstat(&mst);
while ((rc = mdbx_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
while ((rc = mdbx_cursor_get(cursor, &key, &data, MDBX_NEXT)) == 0) {
iptr = data.iov_base;
pages += *iptr;
if (envinfo && mei.me_tail_txnid > *(size_t *)key.iov_base)
@@ -262,7 +262,7 @@ int main(int argc, char *argv[]) {
prstat(&mst);
if (alldbs) {
MDB_cursor *cursor;
MDBX_cursor *cursor;
MDBX_val key;
rc = mdbx_cursor_open(txn, dbi, &cursor);
@@ -271,16 +271,16 @@ int main(int argc, char *argv[]) {
mdbx_strerror(rc));
goto txn_abort;
}
while ((rc = mdbx_cursor_get(cursor, &key, NULL, MDB_NEXT_NODUP)) == 0) {
while ((rc = mdbx_cursor_get(cursor, &key, NULL, MDBX_NEXT_NODUP)) == 0) {
char *str;
MDB_dbi db2;
MDBX_dbi db2;
if (memchr(key.iov_base, '\0', key.iov_len))
continue;
str = malloc(key.iov_len + 1);
memcpy(str, key.iov_base, key.iov_len);
str[key.iov_len] = '\0';
rc = mdbx_dbi_open(txn, str, 0, &db2);
if (rc == MDB_SUCCESS)
if (rc == MDBX_SUCCESS)
printf("Status of %s\n", str);
free(str);
if (rc)
@@ -297,8 +297,8 @@ int main(int argc, char *argv[]) {
mdbx_cursor_close(cursor);
}
if (rc == MDB_NOTFOUND)
rc = MDB_SUCCESS;
if (rc == MDBX_NOTFOUND)
rc = MDBX_SUCCESS;
mdbx_dbi_close(env, dbi);
txn_abort: