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

mdbx: rework/speed up accessing to meta-pages, choosing and cache of ones (squashed).

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-08-17 15:10:05 +03:00
parent ef16dd2a22
commit 7b36f946cb
3 changed files with 736 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1300
src/core.c
View File

File diff suppressed because it is too large Load Diff

24
src/internals.h
View File

@ -455,7 +455,10 @@ typedef struct MDBX_meta {
uint32_t mm_magic_and_version[2]; uint32_t mm_magic_and_version[2];
/* txnid that committed this page, the first of a two-phase-update pair */ /* txnid that committed this page, the first of a two-phase-update pair */
MDBX_atomic_uint32_t mm_txnid_a[2]; union {
MDBX_atomic_uint32_t mm_txnid_a[2];
uint64_t unsafe_txnid;
};
uint16_t mm_extra_flags; /* extra DB flags, zero (nothing) for now */ uint16_t mm_extra_flags; /* extra DB flags, zero (nothing) for now */
uint8_t mm_validator_id; /* ID of checksum and page validation method, uint8_t mm_validator_id; /* ID of checksum and page validation method,
@ -474,8 +477,11 @@ typedef struct MDBX_meta {
#define MDBX_DATASIGN_WEAK 1u #define MDBX_DATASIGN_WEAK 1u
#define SIGN_IS_STEADY(sign) ((sign) > MDBX_DATASIGN_WEAK) #define SIGN_IS_STEADY(sign) ((sign) > MDBX_DATASIGN_WEAK)
#define META_IS_STEADY(meta) \ #define META_IS_STEADY(meta) \
SIGN_IS_STEADY(unaligned_peek_u64_volatile(4, (meta)->mm_datasync_sign)) SIGN_IS_STEADY(unaligned_peek_u64_volatile(4, (meta)->mm_sign))
uint32_t mm_datasync_sign[2]; union {
uint32_t mm_sign[2];
uint64_t unsafe_sign;
};
/* txnid that committed this page, the second of a two-phase-update pair */ /* txnid that committed this page, the second of a two-phase-update pair */
MDBX_atomic_uint32_t mm_txnid_b[2]; MDBX_atomic_uint32_t mm_txnid_b[2];
@ -913,6 +919,13 @@ typedef struct MDBX_dbx {
md_vlen_max; /* min/max value/data length for the database */ md_vlen_max; /* min/max value/data length for the database */
} MDBX_dbx; } MDBX_dbx;
typedef struct xyz {
uint8_t fsm, recent, prefer_steady, tail_and_flags;
#define XYZ_HAVE_STEADY(xyz) ((xyz)->fsm & 7)
#define XYZ_VALID(xyz) ((xyz)->tail_pgno_and_flags & 128)
txnid_t txnid[NUM_METAS];
} meta_xyz_t;
/* A database transaction. /* A database transaction.
* Every operation requires a transaction handle. */ * Every operation requires a transaction handle. */
struct MDBX_txn { struct MDBX_txn {
@ -986,6 +999,7 @@ struct MDBX_txn {
MDBX_reader *reader; MDBX_reader *reader;
} to; } to;
struct { struct {
meta_xyz_t xyz;
/* In write txns, array of cursors for each DB */ /* In write txns, array of cursors for each DB */
pgno_t *reclaimed_pglist; /* Reclaimed GC pages */ pgno_t *reclaimed_pglist; /* Reclaimed GC pages */
txnid_t last_reclaimed; /* ID of last used record */ txnid_t last_reclaimed; /* ID of last used record */
@ -1199,10 +1213,6 @@ struct MDBX_env {
MDBX_txn *me_txn; /* current write transaction */ MDBX_txn *me_txn; /* current write transaction */
osal_fastmutex_t me_dbi_lock; osal_fastmutex_t me_dbi_lock;
#if MDBX_CACHE_METAPTR
volatile const MDBX_meta *cache_last_meta;
volatile const MDBX_meta *cache_steady_meta;
#endif /* MDBX_CACHE_METAPTR */
MDBX_dbi me_numdbs; /* number of DBs opened */ MDBX_dbi me_numdbs; /* number of DBs opened */
MDBX_page *me_dp_reserve; /* list of malloc'ed blocks for re-use */ MDBX_page *me_dp_reserve; /* list of malloc'ed blocks for re-use */

6
src/options.h
View File

@ -92,12 +92,6 @@
#error MDBX_ENABLE_BIGFOOT must be defined as 0 or 1 #error MDBX_ENABLE_BIGFOOT must be defined as 0 or 1
#endif /* MDBX_ENABLE_BIGFOOT */ #endif /* MDBX_ENABLE_BIGFOOT */
#ifndef MDBX_CACHE_METAPTR
#define MDBX_CACHE_METAPTR 0
#elif !(MDBX_CACHE_METAPTR == 0 || MDBX_CACHE_METAPTR == 1)
#error MDBX_CACHE_METAPTR must be defined as 0 or 1
#endif /* MDBX_CACHE_METAPTR */
/** Controls use of POSIX madvise() hints and friends. */ /** Controls use of POSIX madvise() hints and friends. */
#ifndef MDBX_ENABLE_MADVISE #ifndef MDBX_ENABLE_MADVISE
#define MDBX_ENABLE_MADVISE 1 #define MDBX_ENABLE_MADVISE 1