ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

lmdb: fix lmdb_load for properly restoration of dbi-flags.

Browse Source 
Change-Id: I634fd36e3259afd0ddac23c4cb21631f96ba1c86
This commit is contained in:
Leo Yuriev 2015-08-31 23:47:37 +03:00
parent e955d64ebf
commit 030aca6816
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mdb_load.c
View File

@ -28,7 +28,7 @@ static char *subname = NULL;
static size_t lineno; static size_t lineno;
static int version; static int version;
static int flags; static int dbi_flags;
static char *prog; static char *prog;
@ -68,6 +68,7 @@ static void readhdr(void)
{ {
char *ptr; char *ptr;
dbi_flags = 0;
while (fgets(dbuf.mv_data, dbuf.mv_size, stdin) != NULL) { while (fgets(dbuf.mv_data, dbuf.mv_size, stdin) != NULL) {
lineno++; lineno++;
if (!strncmp(dbuf.mv_data, "db_pagesize=", STRLENOF("db_pagesize=")) if (!strncmp(dbuf.mv_data, "db_pagesize=", STRLENOF("db_pagesize="))
@ -137,7 +138,8 @@ static void readhdr(void)
for (i=0; dbflags[i].bit; i++) { for (i=0; dbflags[i].bit; i++) {
if (!strncmp(dbuf.mv_data, dbflags[i].name, dbflags[i].len) && if (!strncmp(dbuf.mv_data, dbflags[i].name, dbflags[i].len) &&
((char *)dbuf.mv_data)[dbflags[i].len] == '=') { ((char *)dbuf.mv_data)[dbflags[i].len] == '=') {
flags |= dbflags[i].bit; if (((char *)dbuf.mv_data)[dbflags[i].len+1] == '1')
dbi_flags |= dbflags[i].bit;
break; break;
} }
} }
@ -293,7 +295,6 @@ int main(int argc, char *argv[])
MDB_dbi dbi; MDB_dbi dbi;
char *envname; char *envname;
int envflags = 0, putflags = 0; int envflags = 0, putflags = 0;
int dohdr = 0;
prog = argv[0]; prog = argv[0];
@ -377,12 +378,6 @@ int main(int argc, char *argv[])
while(!Eof) { while(!Eof) {
MDB_val key, data; MDB_val key, data;
int batch = 0; int batch = 0;
flags = 0;
if (!dohdr) {
dohdr = 1;
} else if (!(mode & NOHDR))
readhdr();
rc = mdb_txn_begin(env, NULL, 0, &txn); rc = mdb_txn_begin(env, NULL, 0, &txn);
if (rc) { if (rc) {
@ -390,7 +385,7 @@ int main(int argc, char *argv[])
goto env_close; goto env_close;
} }
rc = mdb_open(txn, subname, flags|MDB_CREATE, &dbi); rc = mdb_open(txn, subname, dbi_flags|MDB_CREATE, &dbi);
if (rc) { if (rc) {
fprintf(stderr, "mdb_open failed, error %d %s\n", rc, mdb_strerror(rc)); fprintf(stderr, "mdb_open failed, error %d %s\n", rc, mdb_strerror(rc));
goto txn_abort; goto txn_abort;
@ -447,6 +442,8 @@ int main(int argc, char *argv[])
goto env_close; goto env_close;
} }
mdb_dbi_close(env, dbi); mdb_dbi_close(env, dbi);
if(!(mode & NOHDR))
readhdr();
} }
txn_abort: txn_abort: