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

mdbx: cleanup formating.

Browse Source
This commit is contained in:
Leo Yuriev
2017-05-17 20:06:57 +03:00
parent ec114d06b7
commit 00be62e235
3 changed files with 420 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

805
mdbx.h
View File

File diff suppressed because it is too large Load Diff

31
src/bits.h
View File

@@ -431,25 +431,20 @@ struct MDB_txn {
/* Array of sequence numbers for each DB handle */ /* Array of sequence numbers for each DB handle */
unsigned *mt_dbiseqs; unsigned *mt_dbiseqs;
/** @defgroup mt_dbflag Transaction DB Flags /* Transaction DB Flags */
* @ingroup internal #define DB_DIRTY 0x01 /* DB was written in this txn */
* @{ #define DB_STALE 0x02 /* Named-DB record is older than txnID */
*/ #define DB_NEW 0x04 /* Named-DB handle opened in this txn */
#define DB_DIRTY 0x01 /**< DB was written in this txn */ #define DB_VALID 0x08 /* DB handle is valid, see also #MDB_VALID */
#define DB_STALE 0x02 /**< Named-DB record is older than txnID */ #define DB_USRVALID 0x10 /* As #DB_VALID, but not set for #FREE_DBI */
#define DB_NEW 0x04 /**< Named-DB handle opened in this txn */ #define DB_DUPDATA 0x20 /* DB is #MDB_DUPSORT data */
#define DB_VALID 0x08 /**< DB handle is valid, see also #MDB_VALID */ /* In write txns, array of cursors for each DB */
#define DB_USRVALID 0x10 /**< As #DB_VALID, but not set for #FREE_DBI */
#define DB_DUPDATA 0x20 /**< DB is #MDB_DUPSORT data */
/** @} */
/** In write txns, array of cursors for each DB */
MDB_cursor **mt_cursors; MDB_cursor **mt_cursors;
/** Array of flags for each DB */ /* Array of flags for each DB */
unsigned char *mt_dbflags; uint8_t *mt_dbflags;
/** Number of DB records in use, or 0 when the txn is finished. /* Number of DB records in use, or 0 when the txn is finished.
* This number only ever increments until the txn finishes; we * This number only ever increments until the txn finishes; we
* don't decrement it when individual DB handles are closed. * don't decrement it when individual DB handles are closed. */
*/
MDB_dbi mt_numdbs; MDB_dbi mt_numdbs;
/** @defgroup mdbx_txn Transaction Flags /** @defgroup mdbx_txn Transaction Flags

46
src/mdbx.c
View File

@@ -2437,7 +2437,7 @@ size_t mdbx_txn_id(MDB_txn *txn) {
return txn->mt_txnid; return txn->mt_txnid;
} }
/** Export or close DBI handles opened in this txn. */ /* Export or close DBI handles opened in this txn. */
static void mdbx_dbis_update(MDB_txn *txn, int keep) { static void mdbx_dbis_update(MDB_txn *txn, int keep) {
MDB_dbi n = txn->mt_numdbs; MDB_dbi n = txn->mt_numdbs;
MDB_env *env = txn->mt_env; MDB_env *env = txn->mt_env;
@@ -2463,11 +2463,10 @@ static void mdbx_dbis_update(MDB_txn *txn, int keep) {
env->me_numdbs = n; env->me_numdbs = n;
} }
/** End a transaction, except successful commit of a nested transaction. /* End a transaction, except successful commit of a nested transaction.
* May be called twice for readonly txns: First reset it, then abort. * May be called twice for readonly txns: First reset it, then abort.
* @param[in] txn the transaction handle to end * @param[in] txn the transaction handle to end
* @param[in] mode why and how to end the transaction * @param[in] mode why and how to end the transaction */
*/
static int mdbx_txn_end(MDB_txn *txn, unsigned mode) { static int mdbx_txn_end(MDB_txn *txn, unsigned mode) {
MDB_env *env = txn->mt_env; MDB_env *env = txn->mt_env;
static const char *const names[] = MDB_END_NAMES; static const char *const names[] = MDB_END_NAMES;
@@ -4717,8 +4716,7 @@ static int mdbx_page_search(MDB_cursor *mc, MDB_val *key, int flags) {
memcpy(&md_flags, ((char *)data.mv_data + offsetof(MDB_db, md_flags)), memcpy(&md_flags, ((char *)data.mv_data + offsetof(MDB_db, md_flags)),
sizeof(uint16_t)); sizeof(uint16_t));
/* The txn may not know this DBI, or another process may /* The txn may not know this DBI, or another process may
* have dropped and recreated the DB with other flags. * have dropped and recreated the DB with other flags. */
*/
if (unlikely((mc->mc_db->md_flags & PERSISTENT_FLAGS) != md_flags)) if (unlikely((mc->mc_db->md_flags & PERSISTENT_FLAGS) != md_flags))
return MDB_INCOMPATIBLE; return MDB_INCOMPATIBLE;
memcpy(mc->mc_db, data.mv_data, sizeof(MDB_db)); memcpy(mc->mc_db, data.mv_data, sizeof(MDB_db));
@@ -10067,24 +10065,24 @@ int mdbx_replace(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *new_data,
/* если данные совпадают, то ничего делать не надо */ /* если данные совпадают, то ничего делать не надо */
goto bailout; goto bailout;
#if 0 /* LY: исправлено в mdbx_cursor_put(), здесь в качестве памятки */ #if 0 /* LY: исправлено в mdbx_cursor_put(), здесь в качестве памятки */
MDB_node *leaf = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); MDB_node *leaf = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]);
if (F_ISSET(leaf->mn_flags, F_DUPDATA) if (F_ISSET(leaf->mn_flags, F_DUPDATA) &&
&& mc.mc_xcursor->mx_db.md_entries > 1) { mc.mc_xcursor->mx_db.md_entries > 1) {
/* Если у ключа больше одного значения, то /* Если у ключа больше одного значения, то
* сначала удаляем найденое "старое" значение. * сначала удаляем найденое "старое" значение.
* *
* Этого можно не делать, так как MDBX уже * Этого можно не делать, так как MDBX уже
* обучен корректно обрабатывать такие ситуации. * обучен корректно обрабатывать такие ситуации.
* *
* Однако, следует помнить, что в LMDB при * Однако, следует помнить, что в LMDB при
* совпадении размера данных, значение будет * совпадении размера данных, значение будет
* просто перезаписано с нарушением * просто перезаписано с нарушением
* упорядоченности, что сломает поиск. */ * упорядоченности, что сломает поиск. */
rc = mdbx_cursor_del(&mc, 0); rc = mdbx_cursor_del(&mc, 0);
if (rc != MDB_SUCCESS) if (rc != MDB_SUCCESS)
goto bailout; goto bailout;
flags -= MDB_CURRENT; flags -= MDB_CURRENT;
} }
#endif #endif
} }
} else { } else {