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

mdbx: minor cleanup.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-17 20:09:40 +03:00
parent 00be62e235
commit 7a4541f598
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mdbx.c
View File

@ -4636,7 +4636,8 @@ static int mdbx_page_search_root(MDB_cursor *mc, MDB_val *key, int flags) {
} }
if (unlikely(!IS_LEAF(mp))) { if (unlikely(!IS_LEAF(mp))) {
mdbx_debug("internal error, index points to a %02X page!?", mp->mp_flags); mdbx_debug("internal error, index points to a page with 0x%02x flags!?",
mp->mp_flags);
mc->mc_txn->mt_flags |= MDB_TXN_ERROR; mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
return MDB_CORRUPTED; return MDB_CORRUPTED;
} }
@ -9187,9 +9188,9 @@ int __cold mdbx_reader_list(MDB_env *env, MDB_msg_func *func, void *ctx) {
break; break;
} }
} }
if (first) { if (first)
rc = func("(no active readers)\n", ctx); rc = func("(no active readers)\n", ctx);
}
return rc; return rc;
} }
@ -9453,7 +9454,7 @@ static void __hot mdbx_midl_xmerge(MDB_IDL idl, MDB_IDL merge) {
#define SMALL 8 #define SMALL 8
#define MIDL_SWAP(a, b) \ #define MIDL_SWAP(a, b) \
{ \ { \
itmp = (a); \ MDB_ID itmp = (a); \
(a) = (b); \ (a) = (b); \
(b) = itmp; \ (b) = itmp; \
} }
@ -9462,7 +9463,7 @@ static void __hot mdbx_midl_sort(MDB_IDL ids) {
/* Max possible depth of int-indexed tree * 2 items/level */ /* Max possible depth of int-indexed tree * 2 items/level */
int istack[sizeof(int) * CHAR_BIT * 2]; int istack[sizeof(int) * CHAR_BIT * 2];
int i, j, k, l, ir, jstack; int i, j, k, l, ir, jstack;
MDB_ID a, itmp; MDB_ID a;
ir = (int)ids[0]; ir = (int)ids[0];
l = 1; l = 1;
@ -9542,19 +9543,17 @@ static unsigned __hot mdbx_mid2l_search(MDB_ID2L ids, MDB_ID id) {
if (val < 0) { if (val < 0) {
n = pivot; n = pivot;
} else if (val > 0) { } else if (val > 0) {
base = cursor; base = cursor;
n -= pivot + 1; n -= pivot + 1;
} else { } else {
return cursor; return cursor;
} }
} }
if (val > 0) { if (val > 0)
++cursor; ++cursor;
}
return cursor; return cursor;
} }
@ -9562,29 +9561,20 @@ static int mdbx_mid2l_insert(MDB_ID2L ids, MDB_ID2 *id) {
unsigned x, i; unsigned x, i;
x = mdbx_mid2l_search(ids, id->mid); x = mdbx_mid2l_search(ids, id->mid);
if (x < 1)
return /* internal error */ -2;
if (x < 1) { if (x <= ids[0].mid && ids[x].mid == id->mid)
/* internal error */ return /* duplicate */ -1;
return -2;
}
if (x <= ids[0].mid && ids[x].mid == id->mid) { if (ids[0].mid >= MDB_IDL_UM_MAX)
/* duplicate */ return /* too big */ -2;
return -1;
}
if (ids[0].mid >= MDB_IDL_UM_MAX) {
/* too big */
return -2;
} else {
/* insert id */
ids[0].mid++;
for (i = (unsigned)ids[0].mid; i > x; i--)
ids[i] = ids[i - 1];
ids[x] = *id;
}
/* insert id */
ids[0].mid++;
for (i = (unsigned)ids[0].mid; i > x; i--)
ids[i] = ids[i - 1];
ids[x] = *id;
return 0; return 0;
} }