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

mdbx: remove unneeded CC_COPYING.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-07-04 20:53:20 +03:00
parent 1740f8227a
commit 498514dae1
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/core.c
View File

@ -18168,12 +18168,10 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
const size_t ksize_max = keysize_max(env->me_psize, 0); const size_t ksize_max = keysize_max(env->me_psize, 0);
const size_t leaf2_ksize = mp->mp_leaf2_ksize; const size_t leaf2_ksize = mp->mp_leaf2_ksize;
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
if ((mc->mc_checking & CC_COPYING) == 0) { if (unlikely((mc->mc_flags & C_SUB) == 0 ||
if (unlikely((mc->mc_flags & C_SUB) == 0 || (mc->mc_db->md_flags & MDBX_DUPFIXED) == 0))
(mc->mc_db->md_flags & MDBX_DUPFIXED) == 0)) rc = bad_page(mp, "unexpected leaf2-page (db-flags 0x%x)\n",
rc = bad_page(mp, "unexpected leaf2-page (db-flags 0x%x)\n", mc->mc_db->md_flags);
mc->mc_db->md_flags);
}
if (unlikely(leaf2_ksize < 1 || leaf2_ksize > ksize_max)) if (unlikely(leaf2_ksize < 1 || leaf2_ksize > ksize_max))
rc = bad_page(mp, "invalid leaf2-key length (%zu)\n", leaf2_ksize); rc = bad_page(mp, "invalid leaf2-key length (%zu)\n", leaf2_ksize);
} }
@ -18188,8 +18186,7 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
continue; continue;
} }
if ((mc->mc_checking & CC_COPYING) == 0 && if (unlikely(leaf2_ksize != mc->mc_dbx->md_klen_min)) {
unlikely(leaf2_ksize != mc->mc_dbx->md_klen_min)) {
if (unlikely(leaf2_ksize < mc->mc_dbx->md_klen_min || if (unlikely(leaf2_ksize < mc->mc_dbx->md_klen_min ||
leaf2_ksize > mc->mc_dbx->md_klen_max)) leaf2_ksize > mc->mc_dbx->md_klen_max))
rc = bad_page( rc = bad_page(
@ -18224,8 +18221,7 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
continue; continue;
} }
if ((IS_LEAF(mp) || i > 0)) { if ((IS_LEAF(mp) || i > 0)) {
if ((mc->mc_checking & CC_COPYING) == 0 && if (unlikely(ksize < mc->mc_dbx->md_klen_min ||
unlikely(ksize < mc->mc_dbx->md_klen_min ||
ksize > mc->mc_dbx->md_klen_max)) ksize > mc->mc_dbx->md_klen_max))
rc = bad_page( rc = bad_page(
mp, "node[%u] key size (%zu) <> min/max key-length (%zu/%zu)\n", mp, "node[%u] key size (%zu) <> min/max key-length (%zu/%zu)\n",
@ -18276,14 +18272,12 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
"bigdata-pgno", i, nkeys, dsize, data + dsize - end_of_page); "bigdata-pgno", i, nkeys, dsize, data + dsize - end_of_page);
continue; continue;
} }
if ((mc->mc_checking & CC_COPYING) == 0) { if (unlikely(dsize <= mc->mc_dbx->md_vlen_min ||
if (unlikely(dsize <= mc->mc_dbx->md_vlen_min || dsize > mc->mc_dbx->md_vlen_max))
dsize > mc->mc_dbx->md_vlen_max)) rc = bad_page(
rc = bad_page( mp,
mp, "big-node data size (%zu) <> min/max value-length (%zu/%zu)\n",
"big-node data size (%zu) <> min/max value-length (%zu/%zu)\n", dsize, mc->mc_dbx->md_vlen_min, mc->mc_dbx->md_vlen_max);
dsize, mc->mc_dbx->md_vlen_min, mc->mc_dbx->md_vlen_max);
}
if ((mc->mc_checking & CC_RETIRING) == 0) { if ((mc->mc_checking & CC_RETIRING) == 0) {
/* Disable full checking to avoid infinite recursion /* Disable full checking to avoid infinite recursion
* with a corrupted DB */ * with a corrupted DB */
@ -18323,14 +18317,12 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
/* wrong, but already handled */ /* wrong, but already handled */
continue; continue;
case 0 /* usual */: case 0 /* usual */:
if ((mc->mc_checking & CC_COPYING) == 0) { if (unlikely(dsize < mc->mc_dbx->md_vlen_min ||
if (unlikely(dsize < mc->mc_dbx->md_vlen_min || dsize > mc->mc_dbx->md_vlen_max)) {
dsize > mc->mc_dbx->md_vlen_max)) { rc = bad_page(
rc = bad_page( mp, "node-data size (%zu) <> min/max value-length (%zu/%zu)\n",
mp, "node-data size (%zu) <> min/max value-length (%zu/%zu)\n", dsize, mc->mc_dbx->md_vlen_min, mc->mc_dbx->md_vlen_max);
dsize, mc->mc_dbx->md_vlen_min, mc->mc_dbx->md_vlen_max); continue;
continue;
}
} }
break; break;
case F_SUBDATA /* sub-db */: case F_SUBDATA /* sub-db */:
@ -18376,8 +18368,7 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
continue; continue;
} }
if ((mc->mc_checking & CC_COPYING) == 0 && if (unlikely(sub_ksize != mc->mc_dbx->md_vlen_min)) {
unlikely(sub_ksize != mc->mc_dbx->md_vlen_min)) {
if (unlikely(sub_ksize < mc->mc_dbx->md_vlen_min || if (unlikely(sub_ksize < mc->mc_dbx->md_vlen_min ||
sub_ksize > mc->mc_dbx->md_vlen_max)) sub_ksize > mc->mc_dbx->md_vlen_max))
rc = bad_page(mp, rc = bad_page(mp,
@ -18415,15 +18406,13 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
size_t sub_dsize = node_ds(sub_node); size_t sub_dsize = node_ds(sub_node);
/* char *sub_data = node_data(sub_node); */ /* char *sub_data = node_data(sub_node); */
if ((mc->mc_checking & CC_COPYING) == 0) { if (unlikely(sub_ksize < mc->mc_dbx->md_vlen_min ||
if (unlikely(sub_ksize < mc->mc_dbx->md_vlen_min || sub_ksize > mc->mc_dbx->md_vlen_max))
sub_ksize > mc->mc_dbx->md_vlen_max)) rc = bad_page(mp,
rc = bad_page(mp, "nested-node-key size (%zu) <> min/max "
"nested-node-key size (%zu) <> min/max " "value-length (%zu/%zu)\n",
"value-length (%zu/%zu)\n", sub_ksize, mc->mc_dbx->md_vlen_min,
sub_ksize, mc->mc_dbx->md_vlen_min, mc->mc_dbx->md_vlen_max);
mc->mc_dbx->md_vlen_max);
}
if ((mc->mc_checking & CC_SKIPORD) == 0) { if ((mc->mc_checking & CC_SKIPORD) == 0) {
sub_here.iov_len = sub_ksize; sub_here.iov_len = sub_ksize;
sub_here.iov_base = sub_key; sub_here.iov_base = sub_key;

1
src/internals.h
View File

@ -1051,7 +1051,6 @@ struct MDBX_cursor {
#define CC_BRANCH 0x01 /* same as P_BRANCH for CHECK_LEAF_TYPE() */ #define CC_BRANCH 0x01 /* same as P_BRANCH for CHECK_LEAF_TYPE() */
#define CC_LEAF 0x02 /* same as P_LEAF for CHECK_LEAF_TYPE() */ #define CC_LEAF 0x02 /* same as P_LEAF for CHECK_LEAF_TYPE() */
#define CC_UPDATING 0x04 /* update/rebalance pending */ #define CC_UPDATING 0x04 /* update/rebalance pending */
#define CC_COPYING 0x08 /* skip key-value length check (copying simplify) */
#define CC_SKIPORD 0x10 /* don't check keys ordering */ #define CC_SKIPORD 0x10 /* don't check keys ordering */
#define CC_LEAF2 0x20 /* same as P_LEAF2 for CHECK_LEAF_TYPE() */ #define CC_LEAF2 0x20 /* same as P_LEAF2 for CHECK_LEAF_TYPE() */
#define CC_RETIRING 0x40 /* refs to child pages may be invalid */ #define CC_RETIRING 0x40 /* refs to child pages may be invalid */