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

mdbx: backport - ITS#8319 mdb_load: explain readline and mdb_cursor_put errors.

Browse Source 
Change-Id: I99e8ff220bb37109da83bb6088be7597b52c6f00
This commit is contained in:
Orivej Desh
2015-11-22 00:59:55 +00:00
committed by Leo Yuriev
parent aeea7ebb08
commit a8e2288537
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -21,6 +21,7 @@ LMDB 0.9.17 Release Engineering
Fix ITS#8313 mdb_rebalance dummy cursor Fix ITS#8313 mdb_rebalance dummy cursor
Fix ITS#8315 dirty_room in nested txn Fix ITS#8315 dirty_room in nested txn
Fix ITS#8316 page_merge cursor tracking Fix ITS#8316 page_merge cursor tracking
Fix ITS#8319 mdb_load error messages
Fix ITS#8321 cursor tracking Fix ITS#8321 cursor tracking
Added mdb_txn_id() (ITS#7994) Added mdb_txn_id() (ITS#7994)
Added robust mutex support Added robust mutex support

12
mdb_load.c
View File

@@ -399,20 +399,22 @@ int main(int argc, char *argv[])
while(1) { while(1) {
rc = readline(&key, &kbuf); rc = readline(&key, &kbuf);
if (rc == EOF) if (rc) /* rc == EOF */
break; break;
if (rc)
goto txn_abort;
rc = readline(&data, &dbuf); rc = readline(&data, &dbuf);
if (rc) if (rc) {
fprintf(stderr, "%s: line %" Z "d: failed to read key value\n", prog, lineno);
goto txn_abort; goto txn_abort;
}
rc = mdb_cursor_put(mc, &key, &data, putflags); rc = mdb_cursor_put(mc, &key, &data, putflags);
if (rc == MDB_KEYEXIST && putflags) if (rc == MDB_KEYEXIST && putflags)
continue; continue;
if (rc) if (rc) {
fprintf(stderr, "mdb_cursor_put failed, error %d %s\n", rc, mdb_strerror(rc));
goto txn_abort; goto txn_abort;
}
batch++; batch++;
if (batch == 100) { if (batch == 100) {
rc = mdb_txn_commit(txn); rc = mdb_txn_commit(txn);