mirror of
https://github.com/isar/libmdbx.git
synced 2025-04-03 15:42:58 +08:00
mdbx: rework page validation/checking, add MDBX_VALIDATION option (squashed).
Здесь основная часть изменений преобразующих отладочную проверку страниц в регулярный и доступный пользователю осторожный/безопасный режим работы с потенциально поврежденной БД. Here the major part of the changes that transform a debugging check of pages into a regular and user-accessible careful/safe mode for working with a potentially corrupted database.
This commit is contained in:
Леонид Юрьев (Leonid Yuriev)
parent
6c5ff863ff
commit
d4ef9bf233
@ -497,7 +497,7 @@ mark_as_advanced(MDBX_LOCKING)
|
||||
add_mdbx_option(MDBX_TRUST_RTC "Does a system have battery-backed Real-Time Clock or just a fake" AUTO)
|
||||
mark_as_advanced(MDBX_TRUST_RTC)
|
||||
option(MDBX_FORCE_ASSERTIONS "Force enable assertion checking" OFF)
|
||||
option(MDBX_DISABLE_PAGECHECKS "Disable some checks to reduce an overhead and detection probability of database corruption to a values closer to the LMDB" OFF)
|
||||
option(MDBX_DISABLE_VALIDATION "Disable some checks to reduce an overhead and detection probability of database corruption to a values closer to the LMDB" OFF)
|
||||
|
||||
if(NOT MDBX_AMALGAMATED_SOURCE)
|
||||
if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE_UPPERCASE STREQUAL "DEBUG")
|
||||
|
||||
5
mdbx.h
5
mdbx.h
@ -1023,6 +1023,9 @@ LIBMDBX_API void mdbx_assert_fail(const MDBX_env *env, const char *msg,
|
||||
enum MDBX_env_flags_t {
|
||||
MDBX_ENV_DEFAULTS = 0,
|
||||
|
||||
/** Extra validation of DB structure and pages content. */
|
||||
MDBX_VALIDATION = UINT32_C(0x00002000),
|
||||
|
||||
/** No environment directory.
|
||||
*
|
||||
* By default, MDBX creates its environment in a directory whose pathname is
|
||||
@ -5091,7 +5094,7 @@ LIBMDBX_API int mdbx_thread_unregister(const MDBX_env *env);
|
||||
* \retval 1 Transaction aborted asynchronous and reader slot
|
||||
* should be cleared immediately, i.e. read transaction
|
||||
* will not continue but \ref mdbx_txn_abort()
|
||||
* or \ref mdbx_txn_reset() will be called later.
|
||||
* nor \ref mdbx_txn_reset() will be called later.
|
||||
*
|
||||
* \retval 2 or great The reader process was terminated or killed,
|
||||
* and libmdbx should entirely reset reader registration.
|
||||
|
||||
@ -13,7 +13,7 @@ N | MASK | ENV | TXN | DB | PUT | DBI | NOD
|
||||
10|0000 0400| | | | | | | | |
|
||||
11|0000 0800| | | | | | | | |
|
||||
12|0000 1000| | | | | | | | |
|
||||
13|0000 2000| | | | | | |P_SPILLED | |
|
||||
13|0000 2000|VALIDATION | | | | | |P_SPILLED | |
|
||||
14|0000 4000|NOSUBDIR | | | | | |P_LOOSE | |
|
||||
15|0000 8000| | |DB_VALID |NOSPILL | | |P_FROZEN | |
|
||||
16|0001 0000|SAFE_NOSYNC|TXN_NOSYNC | |RESERVE | |RESERVE | | |
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#ifndef MDBX_TRUST_RTC_AUTO
|
||||
#cmakedefine01 MDBX_TRUST_RTC
|
||||
#endif
|
||||
#cmakedefine01 MDBX_DISABLE_PAGECHECKS
|
||||
#cmakedefine01 MDBX_DISABLE_VALIDATION
|
||||
|
||||
/* Windows */
|
||||
#cmakedefine01 MDBX_WITHOUT_MSVC_CRT
|
||||
|
||||
878
src/core.c
878
src/core.c
File diff suppressed because it is too large
Load Diff
@ -523,9 +523,11 @@ typedef struct MDBX_page {
|
||||
#define P_BAD 0x10 /* explicit flag for invalid/bad page */
|
||||
#define P_LEAF2 0x20 /* for MDBX_DUPFIXED records */
|
||||
#define P_SUBP 0x40 /* for MDBX_DUPSORT sub-pages */
|
||||
#define P_SPILLED 0x2000 /* spilled in parent txn */
|
||||
#define P_LOOSE 0x4000 /* page was dirtied then freed, can be reused */
|
||||
#define P_FROZEN 0x8000 /* used for retire page with known status */
|
||||
#define PAGETYPE_EXTRA(p) ((char)(p)->mp_flags)
|
||||
#define PAGETYPE(p) (PAGETYPE_EXTRA(p) & ~P_SUBP)
|
||||
#define P_SPILLED 0x2000 /* spilled in parent txn */
|
||||
#define P_LOOSE 0x4000 /* page was dirtied then freed, can be reused */
|
||||
#define P_FROZEN 0x8000 /* used for retire page with known status */
|
||||
#define P_ILL_BITS (~(P_BRANCH | P_LEAF | P_LEAF2 | P_OVERFLOW | P_SPILLED))
|
||||
uint16_t mp_flags;
|
||||
union {
|
||||
@ -1032,8 +1034,8 @@ struct MDBX_cursor {
|
||||
MDBX_dbx *mc_dbx;
|
||||
/* The mt_dbistate for this database */
|
||||
uint8_t *mc_dbistate;
|
||||
unsigned mc_snum; /* number of pushed pages */
|
||||
unsigned mc_top; /* index of top page, normally mc_snum-1 */
|
||||
uint8_t mc_snum; /* number of pushed pages */
|
||||
uint8_t mc_top; /* index of top page, normally mc_snum-1 */
|
||||
|
||||
/* Cursor state flags. */
|
||||
#define C_INITIALIZED 0x01 /* cursor has been initialized and is valid */
|
||||
@ -1043,18 +1045,27 @@ struct MDBX_cursor {
|
||||
#define C_UNTRACK 0x10 /* Un-track cursor when closing */
|
||||
#define C_RECLAIMING 0x20 /* GC lookup is prohibited */
|
||||
#define C_GCFREEZE 0x40 /* reclaimed_pglist must not be updated */
|
||||
uint8_t mc_flags; /* see mdbx_cursor */
|
||||
|
||||
/* Cursor checking flags. */
|
||||
#define C_COPYING 0x100 /* skip key-value length check (copying simplify) */
|
||||
#define C_UPDATING 0x200 /* update/rebalance pending */
|
||||
#define C_RETIRING 0x400 /* refs to child pages may be invalid */
|
||||
#define C_SKIPORD 0x800 /* don't check keys ordering */
|
||||
#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_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_LEAF2 0x20 /* same as P_LEAF2 for CHECK_LEAF_TYPE() */
|
||||
#define CC_RETIRING 0x40 /* refs to child pages may be invalid */
|
||||
#define CC_PAGECHECK 0x80 /* perform page checking, see MDBX_VALIDATION */
|
||||
uint8_t mc_checking; /* page checking level */
|
||||
|
||||
unsigned mc_flags; /* see mdbx_cursor */
|
||||
MDBX_page *mc_pg[CURSOR_STACK]; /* stack of pushed pages */
|
||||
indx_t mc_ki[CURSOR_STACK]; /* stack of page indices */
|
||||
};
|
||||
|
||||
#define CHECK_LEAF_TYPE(mc, mp) \
|
||||
(((PAGETYPE_EXTRA(mp) ^ (mc)->mc_checking) & \
|
||||
(CC_BRANCH | CC_LEAF | CC_LEAF2)) == 0)
|
||||
|
||||
/* Context for sorted-dup records.
|
||||
* We could have gone to a fully recursive design, with arbitrarily
|
||||
* deep nesting of sub-databases. But for now we only handle these
|
||||
@ -1444,8 +1455,6 @@ MDBX_INTERNAL_FUNC void mdbx_rthc_thread_dtor(void *ptr);
|
||||
/* Test if a page is a sub page */
|
||||
#define IS_SUBP(p) (((p)->mp_flags & P_SUBP) != 0)
|
||||
|
||||
#define PAGETYPE(p) ((p)->mp_flags & (P_BRANCH | P_LEAF | P_LEAF2 | P_OVERFLOW))
|
||||
|
||||
/* Header for a single key/data pair within a page.
|
||||
* Used in pages of type P_BRANCH and P_LEAF without P_LEAF2.
|
||||
* We guarantee 2-byte alignment for 'MDBX_node's.
|
||||
@ -1588,7 +1597,8 @@ log2n_powerof2(size_t value) {
|
||||
* environment and re-opening it with the new flags. */
|
||||
#define ENV_CHANGEABLE_FLAGS \
|
||||
(MDBX_SAFE_NOSYNC | MDBX_NOMETASYNC | MDBX_DEPRECATED_MAPASYNC | \
|
||||
MDBX_NOMEMINIT | MDBX_COALESCE | MDBX_PAGEPERTURB | MDBX_ACCEDE)
|
||||
MDBX_NOMEMINIT | MDBX_COALESCE | MDBX_PAGEPERTURB | MDBX_ACCEDE | \
|
||||
MDBX_VALIDATION)
|
||||
#define ENV_CHANGELESS_FLAGS \
|
||||
(MDBX_NOSUBDIR | MDBX_RDONLY | MDBX_WRITEMAP | MDBX_NOTLS | MDBX_NORDAHEAD | \
|
||||
MDBX_LIFORECLAIM | MDBX_EXCLUSIVE)
|
||||
|
||||
@ -805,9 +805,9 @@ static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler,
|
||||
}
|
||||
|
||||
if (ignore_wrong_order) { /* for debugging with enabled assertions */
|
||||
mc->mc_flags |= C_SKIPORD;
|
||||
mc->mc_checking |= CC_SKIPORD;
|
||||
if (mc->mc_xcursor)
|
||||
mc->mc_xcursor->mx_cursor.mc_flags |= C_SKIPORD;
|
||||
mc->mc_xcursor->mx_cursor.mc_checking |= CC_SKIPORD;
|
||||
}
|
||||
|
||||
const size_t maxkeysize = mdbx_env_get_maxkeysize_ex(env, flags);
|
||||
|
||||
@ -186,10 +186,10 @@ static int dump_sdb(MDBX_txn *txn, MDBX_dbi dbi, char *name) {
|
||||
error("mdbx_cursor_open", rc);
|
||||
return rc;
|
||||
}
|
||||
if (MDBX_DEBUG > 0 && rescue) {
|
||||
cursor->mc_flags |= C_SKIPORD;
|
||||
if (rescue) {
|
||||
cursor->mc_checking |= CC_SKIPORD;
|
||||
if (cursor->mc_xcursor)
|
||||
cursor->mc_xcursor->mx_cursor.mc_flags |= C_SKIPORD;
|
||||
cursor->mc_xcursor->mx_cursor.mc_checking |= CC_SKIPORD;
|
||||
}
|
||||
|
||||
while ((rc = mdbx_cursor_get(cursor, &key, &data, MDBX_NEXT)) ==
|
||||
@ -383,10 +383,10 @@ int main(int argc, char *argv[]) {
|
||||
error("mdbx_cursor_open", rc);
|
||||
goto txn_abort;
|
||||
}
|
||||
if (MDBX_DEBUG > 0 && rescue) {
|
||||
cursor->mc_flags |= C_SKIPORD;
|
||||
if (rescue) {
|
||||
cursor->mc_checking |= CC_SKIPORD;
|
||||
if (cursor->mc_xcursor)
|
||||
cursor->mc_xcursor->mx_cursor.mc_flags |= C_SKIPORD;
|
||||
cursor->mc_xcursor->mx_cursor.mc_checking |= CC_SKIPORD;
|
||||
}
|
||||
|
||||
bool have_raw = false;
|
||||
|
||||
@ -89,11 +89,11 @@
|
||||
|
||||
/** Disable some checks to reduce an overhead and detection probability of
|
||||
* database corruption to a values closer to the LMDB. */
|
||||
#ifndef MDBX_DISABLE_PAGECHECKS
|
||||
#define MDBX_DISABLE_PAGECHECKS 0
|
||||
#elif !(MDBX_DISABLE_PAGECHECKS == 0 || MDBX_DISABLE_PAGECHECKS == 1)
|
||||
#error MDBX_DISABLE_PAGECHECKS must be defined as 0 or 1
|
||||
#endif /* MDBX_DISABLE_PAGECHECKS */
|
||||
#ifndef MDBX_DISABLE_VALIDATION
|
||||
#define MDBX_DISABLE_VALIDATION 0
|
||||
#elif !(MDBX_DISABLE_VALIDATION == 0 || MDBX_DISABLE_VALIDATION == 1)
|
||||
#error MDBX_DISABLE_VALIDATION must be defined as 0 or 1
|
||||
#endif /* MDBX_DISABLE_VALIDATION */
|
||||
|
||||
#ifndef MDBX_PNL_PREALLOC_FOR_RADIXSORT
|
||||
#define MDBX_PNL_PREALLOC_FOR_RADIXSORT 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user