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

mdbx: rework MDBX_txn.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-23 21:36:09 +03:00
parent 34213c554a
commit ac8e987346
10 changed files with 262 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
mdbx.h
View File

@ -111,7 +111,7 @@ typedef struct MDB_env MDB_env;
* *
* All database operations require a transaction handle. Transactions may be * All database operations require a transaction handle. Transactions may be
* read-only or read-write. */ * read-only or read-write. */
typedef struct MDB_txn MDB_txn; typedef struct MDBX_txn MDBX_txn;
/* A handle for an individual database in the DB environment. */ /* A handle for an individual database in the DB environment. */
typedef uint32_t MDB_dbi; typedef uint32_t MDB_dbi;
@ -161,7 +161,7 @@ typedef int(MDB_cmp_func)(const MDB_val *a, const MDB_val *b);
#define MDB_WRITEMAP 0x80000u #define MDB_WRITEMAP 0x80000u
/* use asynchronous msync when MDB_WRITEMAP is used */ /* use asynchronous msync when MDB_WRITEMAP is used */
#define MDB_MAPASYNC 0x100000u #define MDB_MAPASYNC 0x100000u
/* tie reader locktable slots to MDB_txn objects instead of to threads */ /* tie reader locktable slots to MDBX_txn objects instead of to threads */
#define MDB_NOTLS 0x200000u #define MDB_NOTLS 0x200000u
/* don't do any locking, caller must manage their own locks /* don't do any locking, caller must manage their own locks
* WARNING: libmdbx don't support this mode. */ * WARNING: libmdbx don't support this mode. */
@ -464,8 +464,8 @@ LIBMDBX_API int mdbx_env_create(MDB_env **penv);
* *
* - MDB_NOTLS * - MDB_NOTLS
* Don't use Thread-Local Storage. Tie reader locktable slots to * Don't use Thread-Local Storage. Tie reader locktable slots to
* MDB_txn objects instead of to threads. I.e. mdbx_txn_reset() keeps * MDBX_txn objects instead of to threads. I.e. mdbx_txn_reset() keeps
* the slot reseved for the MDB_txn object. A thread may use parallel * the slot reseved for the MDBX_txn object. A thread may use parallel
* read-only transactions. A read-only transaction may span threads if * read-only transactions. A read-only transaction may span threads if
* the user synchronizes its use. Applications that multiplex many * the user synchronizes its use. Applications that multiplex many
* user threads over individual OS threads need this option. Such an * user threads over individual OS threads need this option. Such an
@ -722,7 +722,7 @@ LIBMDBX_API int mdbx_env_set_mapsize(MDB_env *env, size_t size);
* Starting a read-only transaction normally ties a lock table slot to the * Starting a read-only transaction normally ties a lock table slot to the
* current thread until the environment closes or the thread exits. If * current thread until the environment closes or the thread exits. If
* MDB_NOTLS is in use, mdbx_txn_begin() instead ties the slot to the * MDB_NOTLS is in use, mdbx_txn_begin() instead ties the slot to the
* MDB_txn object until it or the MDB_env object is destroyed. * MDBX_txn object until it or the MDB_env object is destroyed.
* This function may only be called after mdbx_env_create() and before * This function may only be called after mdbx_env_create() and before
* mdbx_env_open(). * mdbx_env_open().
* *
@ -830,7 +830,7 @@ LIBMDBX_API int mdbx_env_set_assert(MDB_env *env, MDB_assert_func *func);
* - MDB_RDONLY * - MDB_RDONLY
* This transaction will not perform any write operations. * This transaction will not perform any write operations.
* *
* [out] txn Address where the new MDB_txn handle will be stored * [out] txn Address where the new MDBX_txn handle will be stored
* *
* Returns A non-zero error value on failure and 0 on success, some * Returns A non-zero error value on failure and 0 on success, some
* possible errors are: * possible errors are:
@ -842,14 +842,14 @@ LIBMDBX_API int mdbx_env_set_assert(MDB_env *env, MDB_assert_func *func);
* - MDB_READERS_FULL - a read-only transaction was requested and the reader * - MDB_READERS_FULL - a read-only transaction was requested and the reader
* lock table is full. See mdbx_env_set_maxreaders(). * lock table is full. See mdbx_env_set_maxreaders().
* - MDBX_ENOMEM - out of memory. */ * - MDBX_ENOMEM - out of memory. */
LIBMDBX_API int mdbx_txn_begin(MDB_env *env, MDB_txn *parent, unsigned flags, LIBMDBX_API int mdbx_txn_begin(MDB_env *env, MDBX_txn *parent, unsigned flags,
MDB_txn **txn); MDBX_txn **txn);
/* Returns the transaction's MDB_env /* Returns the transaction's MDB_env
* *
* [in] txn A transaction handle returned by mdbx_txn_begin() * [in] txn A transaction handle returned by mdbx_txn_begin()
*/ */
LIBMDBX_API MDB_env *mdbx_txn_env(MDB_txn *txn); LIBMDBX_API MDB_env *mdbx_txn_env(MDBX_txn *txn);
/* Return the transaction's ID. /* Return the transaction's ID.
* *
@ -860,7 +860,7 @@ LIBMDBX_API MDB_env *mdbx_txn_env(MDB_txn *txn);
* [in] txn A transaction handle returned by mdbx_txn_begin() * [in] txn A transaction handle returned by mdbx_txn_begin()
* *
* Returns A transaction ID, valid if input is an active transaction. */ * Returns A transaction ID, valid if input is an active transaction. */
LIBMDBX_API uint64_t mdbx_txn_id(MDB_txn *txn); LIBMDBX_API uint64_t mdbx_txn_id(MDBX_txn *txn);
/* Commit all the operations of a transaction into the database. /* Commit all the operations of a transaction into the database.
* *
@ -879,7 +879,7 @@ LIBMDBX_API uint64_t mdbx_txn_id(MDB_txn *txn);
* - MDBX_ENOSPC - no more disk space. * - MDBX_ENOSPC - no more disk space.
* - MDBX_EIO - a low-level I/O error occurred while writing. * - MDBX_EIO - a low-level I/O error occurred while writing.
* - MDBX_ENOMEM - out of memory. */ * - MDBX_ENOMEM - out of memory. */
LIBMDBX_API int mdbx_txn_commit(MDB_txn *txn); LIBMDBX_API int mdbx_txn_commit(MDBX_txn *txn);
/* Abandon all the operations of the transaction instead of saving them. /* Abandon all the operations of the transaction instead of saving them.
* *
@ -890,7 +890,7 @@ LIBMDBX_API int mdbx_txn_commit(MDB_txn *txn);
* ends. It can be reused with mdbx_cursor_renew() before finally closing it. * ends. It can be reused with mdbx_cursor_renew() before finally closing it.
* *
* [in] txn A transaction handle returned by mdbx_txn_begin(). */ * [in] txn A transaction handle returned by mdbx_txn_begin(). */
LIBMDBX_API int mdbx_txn_abort(MDB_txn *txn); LIBMDBX_API int mdbx_txn_abort(MDBX_txn *txn);
/* Reset a read-only transaction. /* Reset a read-only transaction.
* *
@ -899,7 +899,7 @@ LIBMDBX_API int mdbx_txn_abort(MDB_txn *txn);
* allocation overhead if the process will start a new read-only transaction * allocation overhead if the process will start a new read-only transaction
* soon, and also locking overhead if MDB_NOTLS is in use. The reader table * soon, and also locking overhead if MDB_NOTLS is in use. The reader table
* lock is released, but the table slot stays tied to its thread or * lock is released, but the table slot stays tied to its thread or
* MDB_txn. Use mdbx_txn_abort() to discard a reset handle, and to free * MDBX_txn. Use mdbx_txn_abort() to discard a reset handle, and to free
* its lock table slot if MDB_NOTLS is in use. * its lock table slot if MDB_NOTLS is in use.
* *
* Cursors opened within the transaction must not be used * Cursors opened within the transaction must not be used
@ -911,7 +911,7 @@ LIBMDBX_API int mdbx_txn_abort(MDB_txn *txn);
* the database size may grow much more rapidly than otherwise. * the database size may grow much more rapidly than otherwise.
* *
* [in] txn A transaction handle returned by mdbx_txn_begin() */ * [in] txn A transaction handle returned by mdbx_txn_begin() */
LIBMDBX_API int mdbx_txn_reset(MDB_txn *txn); LIBMDBX_API int mdbx_txn_reset(MDBX_txn *txn);
/* Renew a read-only transaction. /* Renew a read-only transaction.
* *
@ -926,7 +926,7 @@ LIBMDBX_API int mdbx_txn_reset(MDB_txn *txn);
* - MDB_PANIC - a fatal error occurred earlier and the environment * - MDB_PANIC - a fatal error occurred earlier and the environment
* must be shut down. * must be shut down.
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_txn_renew(MDB_txn *txn); LIBMDBX_API int mdbx_txn_renew(MDBX_txn *txn);
/* Open a table in the environment. /* Open a table in the environment.
* *
@ -994,10 +994,10 @@ LIBMDBX_API int mdbx_txn_renew(MDB_txn *txn);
* environment and MDB_CREATE was not specified. * environment and MDB_CREATE was not specified.
* - MDB_DBS_FULL - too many databases have been opened. * - MDB_DBS_FULL - too many databases have been opened.
* See mdbx_env_set_maxdbs(). */ * See mdbx_env_set_maxdbs(). */
LIBMDBX_API int mdbx_dbi_open_ex(MDB_txn *txn, const char *name, unsigned flags, LIBMDBX_API int mdbx_dbi_open_ex(MDBX_txn *txn, const char *name,
MDB_dbi *dbi, MDB_cmp_func *keycmp, unsigned flags, MDB_dbi *dbi,
MDB_cmp_func *datacmp); MDB_cmp_func *keycmp, MDB_cmp_func *datacmp);
LIBMDBX_API int mdbx_dbi_open(MDB_txn *txn, const char *name, unsigned flags, LIBMDBX_API int mdbx_dbi_open(MDBX_txn *txn, const char *name, unsigned flags,
MDB_dbi *dbi); MDB_dbi *dbi);
/* Retrieve statistics for a database. /* Retrieve statistics for a database.
@ -1010,7 +1010,7 @@ LIBMDBX_API int mdbx_dbi_open(MDB_txn *txn, const char *name, unsigned flags,
* Returns A non-zero error value on failure and 0 on success, some * Returns A non-zero error value on failure and 0 on success, some
* possible errors are: * possible errors are:
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_dbi_stat(MDB_txn *txn, MDB_dbi dbi, MDBX_stat *stat, LIBMDBX_API int mdbx_dbi_stat(MDBX_txn *txn, MDB_dbi dbi, MDBX_stat *stat,
size_t bytes); size_t bytes);
/* Retrieve the DB flags for a database handle. /* Retrieve the DB flags for a database handle.
@ -1020,7 +1020,7 @@ LIBMDBX_API int mdbx_dbi_stat(MDB_txn *txn, MDB_dbi dbi, MDBX_stat *stat,
* [out] flags Address where the flags will be returned. * [out] flags Address where the flags will be returned.
* *
* Returns A non-zero error value on failure and 0 on success. */ * Returns A non-zero error value on failure and 0 on success. */
LIBMDBX_API int mdbx_dbi_flags(MDB_txn *txn, MDB_dbi dbi, unsigned *flags); LIBMDBX_API int mdbx_dbi_flags(MDBX_txn *txn, MDB_dbi dbi, unsigned *flags);
/* Close a database handle. Normally unnecessary. /* Close a database handle. Normally unnecessary.
* *
@ -1051,7 +1051,7 @@ LIBMDBX_API int mdbx_dbi_close(MDB_env *env, MDB_dbi dbi);
* and close the DB handle. * and close the DB handle.
* *
* Returns A non-zero error value on failure and 0 on success. */ * Returns A non-zero error value on failure and 0 on success. */
LIBMDBX_API int mdbx_drop(MDB_txn *txn, MDB_dbi dbi, int del); LIBMDBX_API int mdbx_drop(MDBX_txn *txn, MDB_dbi dbi, int del);
/* Get items from a database. /* Get items from a database.
* *
@ -1079,7 +1079,7 @@ LIBMDBX_API int mdbx_drop(MDB_txn *txn, MDB_dbi dbi, int del);
* possible errors are: * possible errors are:
* - MDB_NOTFOUND - the key was not in the database. * - MDB_NOTFOUND - the key was not in the database.
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_get(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, LIBMDBX_API int mdbx_get(MDBX_txn *txn, MDB_dbi dbi, MDB_val *key,
MDB_val *data); MDB_val *data);
/* Store items into a database. /* Store items into a database.
@ -1139,8 +1139,8 @@ LIBMDBX_API int mdbx_get(MDB_txn *txn, MDB_dbi dbi, MDB_val *key,
* - MDB_TXN_FULL - the transaction has too many dirty pages. * - MDB_TXN_FULL - the transaction has too many dirty pages.
* - MDBX_EACCES - an attempt was made to write in a read-only transaction. * - MDBX_EACCES - an attempt was made to write in a read-only transaction.
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_put(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data, LIBMDBX_API int mdbx_put(MDBX_txn *txn, MDB_dbi dbi, MDB_val *key,
unsigned flags); MDB_val *data, unsigned flags);
/* Delete items from a database. /* Delete items from a database.
* *
@ -1162,7 +1162,7 @@ LIBMDBX_API int mdbx_put(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data,
* possible errors are: * possible errors are:
* - MDBX_EACCES - an attempt was made to write in a read-only transaction. * - MDBX_EACCES - an attempt was made to write in a read-only transaction.
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_del(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, LIBMDBX_API int mdbx_del(MDBX_txn *txn, MDB_dbi dbi, MDB_val *key,
MDB_val *data); MDB_val *data);
/* Create a cursor handle. /* Create a cursor handle.
@ -1183,7 +1183,7 @@ LIBMDBX_API int mdbx_del(MDB_txn *txn, MDB_dbi dbi, MDB_val *key,
* Returns A non-zero error value on failure and 0 on success, some * Returns A non-zero error value on failure and 0 on success, some
* possible errors are: * possible errors are:
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_cursor_open(MDB_txn *txn, MDB_dbi dbi, LIBMDBX_API int mdbx_cursor_open(MDBX_txn *txn, MDB_dbi dbi,
MDB_cursor **cursor); MDB_cursor **cursor);
/* Close a cursor handle. /* Close a cursor handle.
@ -1209,12 +1209,12 @@ LIBMDBX_API void mdbx_cursor_close(MDB_cursor *cursor);
* Returns A non-zero error value on failure and 0 on success, some * Returns A non-zero error value on failure and 0 on success, some
* possible errors are: * possible errors are:
* - MDBX_EINVAL - an invalid parameter was specified. */ * - MDBX_EINVAL - an invalid parameter was specified. */
LIBMDBX_API int mdbx_cursor_renew(MDB_txn *txn, MDB_cursor *cursor); LIBMDBX_API int mdbx_cursor_renew(MDBX_txn *txn, MDB_cursor *cursor);
/* Return the cursor's transaction handle. /* Return the cursor's transaction handle.
* *
* [in] cursor A cursor handle returned by mdbx_cursor_open() */ * [in] cursor A cursor handle returned by mdbx_cursor_open() */
LIBMDBX_API MDB_txn *mdbx_cursor_txn(MDB_cursor *cursor); LIBMDBX_API MDBX_txn *mdbx_cursor_txn(MDB_cursor *cursor);
/* Return the cursor's database handle. /* Return the cursor's database handle.
* *
@ -1353,7 +1353,7 @@ LIBMDBX_API int mdbx_cursor_count(MDB_cursor *cursor, uint64_t *countp);
* [in] b The second item to compare * [in] b The second item to compare
* *
* Returns < 0 if a < b, 0 if a == b, > 0 if a > b */ * Returns < 0 if a < b, 0 if a == b, > 0 if a > b */
LIBMDBX_API int mdbx_cmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, LIBMDBX_API int mdbx_cmp(MDBX_txn *txn, MDB_dbi dbi, const MDB_val *a,
const MDB_val *b); const MDB_val *b);
/* Compare two data items according to a particular database. /* Compare two data items according to a particular database.
@ -1367,7 +1367,7 @@ LIBMDBX_API int mdbx_cmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a,
* [in] b The second item to compare * [in] b The second item to compare
* *
* Returns < 0 if a < b, 0 if a == b, > 0 if a > b */ * Returns < 0 if a < b, 0 if a == b, > 0 if a > b */
LIBMDBX_API int mdbx_dcmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, LIBMDBX_API int mdbx_dcmp(MDBX_txn *txn, MDB_dbi dbi, const MDB_val *a,
const MDB_val *b); const MDB_val *b);
/* A callback function used to print a message from the library. /* A callback function used to print a message from the library.
@ -1429,7 +1429,7 @@ LIBMDBX_API int mdbx_env_set_syncbytes(MDB_env *env, size_t bytes);
* *
* Returns Number of transactions committed after the given was started for * Returns Number of transactions committed after the given was started for
* read, or -1 on failure. */ * read, or -1 on failure. */
LIBMDBX_API int mdbx_txn_straggler(MDB_txn *txn, int *percent); LIBMDBX_API int mdbx_txn_straggler(MDBX_txn *txn, int *percent);
/* A callback function for killing a laggard readers, /* A callback function for killing a laggard readers,
* but also could waiting ones. Called in case of MDB_MAP_FULL error. * but also could waiting ones. Called in case of MDB_MAP_FULL error.
@ -1487,13 +1487,13 @@ typedef int MDBX_pgvisitor_func(uint64_t pgno, unsigned pgnumber, void *ctx,
const char *dbi, const char *type, int nentries, const char *dbi, const char *type, int nentries,
int payload_bytes, int header_bytes, int payload_bytes, int header_bytes,
int unused_bytes); int unused_bytes);
LIBMDBX_API int mdbx_env_pgwalk(MDB_txn *txn, MDBX_pgvisitor_func *visitor, LIBMDBX_API int mdbx_env_pgwalk(MDBX_txn *txn, MDBX_pgvisitor_func *visitor,
void *ctx); void *ctx);
typedef struct mdbx_canary { uint64_t x, y, z, v; } mdbx_canary; typedef struct mdbx_canary { uint64_t x, y, z, v; } mdbx_canary;
LIBMDBX_API int mdbx_canary_put(MDB_txn *txn, const mdbx_canary *canary); LIBMDBX_API int mdbx_canary_put(MDBX_txn *txn, const mdbx_canary *canary);
LIBMDBX_API int mdbx_canary_get(MDB_txn *txn, mdbx_canary *canary); LIBMDBX_API int mdbx_canary_get(MDBX_txn *txn, mdbx_canary *canary);
/* Returns: /* Returns:
* - MDBX_RESULT_TRUE * - MDBX_RESULT_TRUE
@ -1509,19 +1509,19 @@ LIBMDBX_API int mdbx_cursor_on_first(MDB_cursor *mc);
/* Returns: MDBX_RESULT_TRUE, MDBX_RESULT_FALSE or Error code. */ /* Returns: MDBX_RESULT_TRUE, MDBX_RESULT_FALSE or Error code. */
LIBMDBX_API int mdbx_cursor_on_last(MDB_cursor *mc); LIBMDBX_API int mdbx_cursor_on_last(MDB_cursor *mc);
LIBMDBX_API int mdbx_replace(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, LIBMDBX_API int mdbx_replace(MDBX_txn *txn, MDB_dbi dbi, MDB_val *key,
MDB_val *new_data, MDB_val *old_data, MDB_val *new_data, MDB_val *old_data,
unsigned flags); unsigned flags);
/* Same as mdbx_get(), but: /* Same as mdbx_get(), but:
* 1) if values_count is not NULL, then returns the count * 1) if values_count is not NULL, then returns the count
* of multi-values/duplicates for a given key. * of multi-values/duplicates for a given key.
* 2) updates the key for pointing to the actual key's data inside DB. */ * 2) updates the key for pointing to the actual key's data inside DB. */
LIBMDBX_API int mdbx_get_ex(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, LIBMDBX_API int mdbx_get_ex(MDBX_txn *txn, MDB_dbi dbi, MDB_val *key,
MDB_val *data, int *values_count); MDB_val *data, int *values_count);
LIBMDBX_API int mdbx_is_dirty(const MDB_txn *txn, const void *ptr); LIBMDBX_API int mdbx_is_dirty(const MDBX_txn *txn, const void *ptr);
LIBMDBX_API int mdbx_dbi_sequence(MDB_txn *txn, MDB_dbi dbi, uint64_t *result, LIBMDBX_API int mdbx_dbi_sequence(MDBX_txn *txn, MDB_dbi dbi, uint64_t *result,
uint64_t increment); uint64_t increment);
#ifdef __cplusplus #ifdef __cplusplus

38
src/bits.h
View File

@ -356,12 +356,12 @@ typedef struct MDB_dbx {
/* A database transaction. /* A database transaction.
* Every operation requires a transaction handle. */ * Every operation requires a transaction handle. */
struct MDB_txn { struct MDBX_txn {
#define MDBX_MT_SIGNATURE (0x93D53A31) #define MDBX_MT_SIGNATURE (0x93D53A31)
unsigned mt_signature; unsigned mt_signature;
MDB_txn *mt_parent; /* parent of a nested txn */ MDBX_txn *mt_parent; /* parent of a nested txn */
/* Nested txn under this txn, set together with flag MDB_TXN_HAS_CHILD */ /* Nested txn under this txn, set together with flag MDB_TXN_HAS_CHILD */
MDB_txn *mt_child; MDBX_txn *mt_child;
pgno_t mt_next_pgno; /* next unallocated page */ pgno_t mt_next_pgno; /* next unallocated page */
/* The ID of this transaction. IDs are integers incrementing from 1. /* The ID of this transaction. IDs are integers incrementing from 1.
* Only committed write transactions increment the ID. If a transaction * Only committed write transactions increment the ID. If a transaction
@ -371,22 +371,22 @@ struct MDB_txn {
/* The list of reclaimed txns from freeDB */ /* The list of reclaimed txns from freeDB */
MDB_IDL mt_lifo_reclaimed; MDB_IDL mt_lifo_reclaimed;
/* The list of pages that became unused during this transaction. */ /* The list of pages that became unused during this transaction. */
MDB_IDL mt_free_pgs; MDB_IDL mt_free_pages;
/* The list of loose pages that became unused and may be reused /* The list of loose pages that became unused and may be reused
* in this transaction, linked through NEXT_LOOSE_PAGE(page). */ * in this transaction, linked through NEXT_LOOSE_PAGE(page). */
MDBX_page *mt_loose_pgs; MDBX_page *mt_loose_pages;
/* Number of loose pages (mt_loose_pgs) */ /* Number of loose pages (mt_loose_pages) */
unsigned mt_loose_count; unsigned mt_loose_count;
/* The sorted list of dirty pages we temporarily wrote to disk /* The sorted list of dirty pages we temporarily wrote to disk
* because the dirty list was full. page numbers in here are * because the dirty list was full. page numbers in here are
* shifted left by 1, deleted slots have the LSB set. */ * shifted left by 1, deleted slots have the LSB set. */
MDB_IDL mt_spill_pgs; MDB_IDL mt_spill_pages;
union { union {
/* For write txns: Modified pages. Sorted when not MDB_WRITEMAP. */ /* For write txns: Modified pages. Sorted when not MDB_WRITEMAP. */
MDB_ID2L dirty_list; MDB_ID2L mt_rw_dirtylist;
/* For read txns: This thread/txn's reader table slot, or NULL. */ /* For read txns: This thread/txn's reader table slot, or NULL. */
MDBX_reader *reader; MDBX_reader *mt_ro_reader;
} mt_u; };
/* Array of records for each DB known in the environment. */ /* Array of records for each DB known in the environment. */
MDB_dbx *mt_dbxs; MDB_dbx *mt_dbxs;
/* Array of MDB_db records for each known DB */ /* Array of MDB_db records for each known DB */
@ -423,15 +423,15 @@ struct MDB_txn {
#define MDB_TXN_ERROR 0x02 /* txn is unusable after an error */ #define MDB_TXN_ERROR 0x02 /* txn is unusable after an error */
#define MDB_TXN_DIRTY 0x04 /* must write, even if dirty list is empty */ #define MDB_TXN_DIRTY 0x04 /* must write, even if dirty list is empty */
#define MDB_TXN_SPILLS 0x08 /* txn or a parent has spilled pages */ #define MDB_TXN_SPILLS 0x08 /* txn or a parent has spilled pages */
#define MDB_TXN_HAS_CHILD 0x10 /* txn has an MDB_txn.mt_child */ #define MDB_TXN_HAS_CHILD 0x10 /* txn has an MDBX_txn.mt_child */
/* most operations on the txn are currently illegal */ /* most operations on the txn are currently illegal */
#define MDB_TXN_BLOCKED (MDB_TXN_FINISHED | MDB_TXN_ERROR | MDB_TXN_HAS_CHILD) #define MDB_TXN_BLOCKED (MDB_TXN_FINISHED | MDB_TXN_ERROR | MDB_TXN_HAS_CHILD)
unsigned mt_flags; unsigned mt_flags;
/* dirty_list room: Array size - dirty pages visible to this txn. /* dirtylist room: Array size - dirty pages visible to this txn.
* Includes ancestor txns' dirty pages not hidden by other txns' * Includes ancestor txns' dirty pages not hidden by other txns'
* dirty/spilled pages. Thus commit(nested txn) has room to merge * dirty/spilled pages. Thus commit(nested txn) has room to merge
* dirty_list into mt_parent after freeing hidden mt_parent pages. */ * dirtylist into mt_parent after freeing hidden mt_parent pages. */
unsigned mt_dirty_room; unsigned mt_dirtyroom;
mdbx_canary mt_canary; mdbx_canary mt_canary;
}; };
@ -461,7 +461,7 @@ struct MDB_cursor {
/* Context used for databases with MDB_DUPSORT, otherwise NULL */ /* Context used for databases with MDB_DUPSORT, otherwise NULL */
struct MDB_xcursor *mc_xcursor; struct MDB_xcursor *mc_xcursor;
/* The transaction that owns this cursor */ /* The transaction that owns this cursor */
MDB_txn *mc_txn; MDBX_txn *mc_txn;
/* The database handle this cursor operates on */ /* The database handle this cursor operates on */
MDB_dbi mc_dbi; MDB_dbi mc_dbi;
/* The database record for this cursor */ /* The database record for this cursor */
@ -555,8 +555,8 @@ struct MDB_env {
char *me_map; /* the memory map of the data file */ char *me_map; /* the memory map of the data file */
MDBX_lockinfo *me_lck; /* the memory map of the lock file, never NULL */ MDBX_lockinfo *me_lck; /* the memory map of the lock file, never NULL */
void *me_pbuf; /* scratch area for DUPSORT put() */ void *me_pbuf; /* scratch area for DUPSORT put() */
MDB_txn *me_txn; /* current write transaction */ MDBX_txn *me_txn; /* current write transaction */
MDB_txn *me_txn0; /* prealloc'd write transaction */ MDBX_txn *me_txn0; /* prealloc'd write transaction */
size_t me_mapsize; /* size of the data memory map */ size_t me_mapsize; /* size of the data memory map */
pgno_t me_maxpg; /* me_mapsize / me_psize */ pgno_t me_maxpg; /* me_mapsize / me_psize */
MDB_dbx *me_dbxs; /* array of static DB info */ MDB_dbx *me_dbxs; /* array of static DB info */
@ -571,7 +571,7 @@ struct MDB_env {
/* IDL of pages that became unused in a write txn */ /* IDL of pages that became unused in a write txn */
MDB_IDL me_free_pgs; MDB_IDL me_free_pgs;
/* ID2L of pages written during a write txn. Length MDB_IDL_UM_SIZE. */ /* ID2L of pages written during a write txn. Length MDB_IDL_UM_SIZE. */
MDB_ID2L me_dirty_list; MDB_ID2L me_dirtylist;
/* Max number of freelist items that can fit in a single overflow page */ /* Max number of freelist items that can fit in a single overflow page */
unsigned me_maxfree_1pg; unsigned me_maxfree_1pg;
/* Max size of a node on a page */ /* Max size of a node on a page */
@ -593,7 +593,7 @@ struct MDB_env {
/* Nested transaction */ /* Nested transaction */
typedef struct MDB_ntxn { typedef struct MDB_ntxn {
MDB_txn mnt_txn; /* the transaction */ MDBX_txn mnt_txn; /* the transaction */
MDB_pgstate mnt_pgstate; /* parent transaction's saved freestate */ MDB_pgstate mnt_pgstate; /* parent transaction's saved freestate */
} MDB_ntxn; } MDB_ntxn;

385
src/mdbx.c
View File

File diff suppressed because it is too large Load Diff

2
src/tools/mdbx_chk.c
View File

@ -76,7 +76,7 @@ uint64_t total_unused_bytes;
int exclusive = 2; int exclusive = 2;
MDB_env *env; MDB_env *env;
MDB_txn *txn, *locktxn; MDBX_txn *txn, *locktxn;
MDBX_envinfo envinfo; MDBX_envinfo envinfo;
MDBX_stat envstat; MDBX_stat envstat;
size_t maxkeysize, userdb_count, skipped_subdb; size_t maxkeysize, userdb_count, skipped_subdb;

4
src/tools/mdbx_dump.c
View File

@ -84,7 +84,7 @@ static void byte(MDB_val *v) {
} }
/* Dump in BDB-compatible format */ /* Dump in BDB-compatible format */
static int dumpit(MDB_txn *txn, MDB_dbi dbi, char *name) { static int dumpit(MDBX_txn *txn, MDB_dbi dbi, char *name) {
MDB_cursor *mc; MDB_cursor *mc;
MDBX_stat ms; MDBX_stat ms;
MDB_val key, data; MDB_val key, data;
@ -155,7 +155,7 @@ static void usage(char *prog) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int i, rc; int i, rc;
MDB_env *env; MDB_env *env;
MDB_txn *txn; MDBX_txn *txn;
MDB_dbi dbi; MDB_dbi dbi;
char *prog = argv[0]; char *prog = argv[0];
char *envname; char *envname;

2
src/tools/mdbx_load.c
View File

@ -294,7 +294,7 @@ static void usage(void) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int i, rc; int i, rc;
MDB_env *env; MDB_env *env;
MDB_txn *txn; MDBX_txn *txn;
MDB_cursor *mc; MDB_cursor *mc;
MDB_dbi dbi; MDB_dbi dbi;
char *envname; char *envname;

2
src/tools/mdbx_stat.c
View File

@ -39,7 +39,7 @@ static void usage(char *prog) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int i, rc; int i, rc;
MDB_env *env; MDB_env *env;
MDB_txn *txn; MDBX_txn *txn;
MDB_dbi dbi; MDB_dbi dbi;
MDBX_stat mst; MDBX_stat mst;
MDBX_envinfo mei; MDBX_envinfo mei;

4
test/test.cc
View File

@ -154,7 +154,7 @@ void testcase::txn_begin(bool readonly) {
log_trace(">> txn_begin(%s)", readonly ? "read-only" : "read-write"); log_trace(">> txn_begin(%s)", readonly ? "read-only" : "read-write");
assert(!txn_guard); assert(!txn_guard);
MDB_txn *txn = nullptr; MDBX_txn *txn = nullptr;
int rc = int rc =
mdbx_txn_begin(db_guard.get(), nullptr, readonly ? MDB_RDONLY : 0, &txn); mdbx_txn_begin(db_guard.get(), nullptr, readonly ? MDB_RDONLY : 0, &txn);
if (unlikely(rc != MDB_SUCCESS)) if (unlikely(rc != MDB_SUCCESS))
@ -168,7 +168,7 @@ void testcase::txn_end(bool abort) {
log_trace(">> txn_end(%s)", abort ? "abort" : "commit"); log_trace(">> txn_end(%s)", abort ? "abort" : "commit");
assert(txn_guard); assert(txn_guard);
MDB_txn *txn = txn_guard.release(); MDBX_txn *txn = txn_guard.release();
if (abort) { if (abort) {
int rc = mdbx_txn_abort(txn); int rc = mdbx_txn_abort(txn);
if (unlikely(rc != MDB_SUCCESS)) if (unlikely(rc != MDB_SUCCESS))

6
test/test.h
View File

@ -58,8 +58,8 @@ struct db_deleter : public std::unary_function<void, MDB_env *> {
void operator()(MDB_env *env) const { mdbx_env_close(env); } void operator()(MDB_env *env) const { mdbx_env_close(env); }
}; };
struct txn_deleter : public std::unary_function<void, MDB_txn *> { struct txn_deleter : public std::unary_function<void, MDBX_txn *> {
void operator()(MDB_txn *txn) const { void operator()(MDBX_txn *txn) const {
int rc = mdbx_txn_abort(txn); int rc = mdbx_txn_abort(txn);
if (rc) if (rc)
log_trouble(__func__, "mdbx_txn_abort()", rc); log_trouble(__func__, "mdbx_txn_abort()", rc);
@ -71,7 +71,7 @@ struct cursor_deleter : public std::unary_function<void, MDB_cursor *> {
}; };
typedef std::unique_ptr<MDB_env, db_deleter> scoped_db_guard; typedef std::unique_ptr<MDB_env, db_deleter> scoped_db_guard;
typedef std::unique_ptr<MDB_txn, txn_deleter> scoped_txn_guard; typedef std::unique_ptr<MDBX_txn, txn_deleter> scoped_txn_guard;
typedef std::unique_ptr<MDB_cursor, cursor_deleter> scoped_cursor_guard; typedef std::unique_ptr<MDB_cursor, cursor_deleter> scoped_cursor_guard;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
tutorial/sample-mdb.txt
View File

@ -27,7 +27,7 @@ int main(int argc,char * argv[])
MDB_env *env; MDB_env *env;
MDB_dbi dbi; MDB_dbi dbi;
MDB_val key, data; MDB_val key, data;
MDB_txn *txn; MDBX_txn *txn;
MDB_cursor *cursor; MDB_cursor *cursor;
char sval[32]; char sval[32];