NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename mdb_open/close mdb_dbi_open/close

Browse Source 
Avoid possible symbol clashes with MDB-Tools libmdb
vmware
Howard Chu 12 years ago
parent e545b742e5
commit 04b7c42109
2 changed files with 30 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 45
      libraries/liblmdb/lmdb.h
  2. 10
      libraries/liblmdb/mdb.c

45
libraries/liblmdb/lmdb.h
Unescape View File

@ -1,7 +1,7 @@
/** @file lmdb.h /** @file lmdb.h
* @brief Lightning memory-mapped database library * @brief Lightning memory-mapped database library
* *
* @mainpage MDB Lightning Memory-Mapped Database Manager * @mainpage Lightning Memory-Mapped Database Manager (MDB)
* *
* @section intro_sec Introduction * @section intro_sec Introduction
* MDB is a Btree-based database management library modeled loosely on the * MDB is a Btree-based database management library modeled loosely on the
@ -237,7 +237,7 @@ typedef void (MDB_rel_func)(MDB_val *item, void *oldptr, void *newptr, void *rel
#define MDB_MAPASYNC 0x100000 #define MDB_MAPASYNC 0x100000
/** @} */ /** @} */
/** @defgroup mdb_open Database Flags /** @defgroup mdb_dbi_open Database Flags
* *
* Values do not overlap Environment Flags. * Values do not overlap Environment Flags.
* @{ * @{
@ -716,9 +716,14 @@ void mdb_txn_reset(MDB_txn *txn);
*/ */
int mdb_txn_renew(MDB_txn *txn); int mdb_txn_renew(MDB_txn *txn);
/** Compat with version <= 0.9.4, avoid clash with libmdb from MDB Tools project */
#define mdb_open(txn,name,flags,dbi) mdb_dbi_open(txn,name,flags,dbi)
/** Compat with version <= 0.9.4, avoid clash with libmdb from MDB Tools project */
#define mdb_close(env,dbi) mdb_dbi_close(env,dbi)
/** @brief Open a database in the environment. /** @brief Open a database in the environment.
* *
* The database handle may be discarded by calling #mdb_close(). The * The database handle may be discarded by calling #mdb_dbi_close(). The
* database handle resides in the shared environment, it is not owned * database handle resides in the shared environment, it is not owned
* by the given transaction. Only one thread should call this function; * by the given transaction. Only one thread should call this function;
* it is not mutex-protected in a read-only transaction. * it is not mutex-protected in a read-only transaction.
@ -768,12 +773,12 @@ int mdb_txn_renew(MDB_txn *txn);
* <li>ENFILE - too many databases have been opened. See #mdb_env_set_maxdbs(). * <li>ENFILE - too many databases have been opened. See #mdb_env_set_maxdbs().
* </ul> * </ul>
*/ */
int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi); int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi);
/** @brief Retrieve statistics for a database. /** @brief Retrieve statistics for a database.
* *
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[out] stat The address of an #MDB_stat structure * @param[out] stat The address of an #MDB_stat structure
* where the statistics will be copied * where the statistics will be copied
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
@ -790,16 +795,16 @@ int mdb_stat(MDB_txn *txn, MDB_dbi dbi, MDB_stat *stat);
* a single thread, and only if no other threads are going to reference * a single thread, and only if no other threads are going to reference
* the database handle any further. * the database handle any further.
* @param[in] env An environment handle returned by #mdb_env_create() * @param[in] env An environment handle returned by #mdb_env_create()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
*/ */
void mdb_close(MDB_env *env, MDB_dbi dbi); void mdb_dbi_close(MDB_env *env, MDB_dbi dbi);
/** @brief Delete a database and/or free all its pages. /** @brief Delete a database and/or free all its pages.
* *
* If the \b del parameter is 1, the DB handle will be closed * If the \b del parameter is 1, the DB handle will be closed
* and the DB will be deleted. * and the DB will be deleted.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] del 1 to delete the DB from the environment, * @param[in] del 1 to delete the DB from the environment,
* 0 to just free its pages. * 0 to just free its pages.
* @return A non-zero error value on failure and 0 on success. * @return A non-zero error value on failure and 0 on success.
@ -811,13 +816,13 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del);
* The comparison function is called whenever it is necessary to compare a * The comparison function is called whenever it is necessary to compare a
* key specified by the application with a key currently stored in the database. * key specified by the application with a key currently stored in the database.
* If no comparison function is specified, and no special key flags were specified * If no comparison function is specified, and no special key flags were specified
* with #mdb_open(), the keys are compared lexically, with shorter keys collating * with #mdb_dbi_open(), the keys are compared lexically, with shorter keys collating
* before longer keys. * before longer keys.
* @warning This function must be called before any data access functions are used, * @warning This function must be called before any data access functions are used,
* otherwise data corruption may occur. The same comparison function must be used by every * otherwise data corruption may occur. The same comparison function must be used by every
* program accessing the database, every time the database is used. * program accessing the database, every time the database is used.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] cmp A #MDB_cmp_func function * @param[in] cmp A #MDB_cmp_func function
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
* errors are: * errors are:
@ -834,13 +839,13 @@ int mdb_set_compare(MDB_txn *txn, MDB_dbi dbi, MDB_cmp_func *cmp);
* This function only takes effect if the database was opened with the #MDB_DUPSORT * This function only takes effect if the database was opened with the #MDB_DUPSORT
* flag. * flag.
* If no comparison function is specified, and no special key flags were specified * If no comparison function is specified, and no special key flags were specified
* with #mdb_open(), the data items are compared lexically, with shorter items collating * with #mdb_dbi_open(), the data items are compared lexically, with shorter items collating
* before longer items. * before longer items.
* @warning This function must be called before any data access functions are used, * @warning This function must be called before any data access functions are used,
* otherwise data corruption may occur. The same comparison function must be used by every * otherwise data corruption may occur. The same comparison function must be used by every
* program accessing the database, every time the database is used. * program accessing the database, every time the database is used.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] cmp A #MDB_cmp_func function * @param[in] cmp A #MDB_cmp_func function
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
* errors are: * errors are:
@ -860,7 +865,7 @@ int mdb_set_dupsort(MDB_txn *txn, MDB_dbi dbi, MDB_cmp_func *cmp);
* Currently the relocation feature is unimplemented and setting * Currently the relocation feature is unimplemented and setting
* this function has no effect. * this function has no effect.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] rel A #MDB_rel_func function * @param[in] rel A #MDB_rel_func function
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
* errors are: * errors are:
@ -874,7 +879,7 @@ int mdb_set_relfunc(MDB_txn *txn, MDB_dbi dbi, MDB_rel_func *rel);
* *
* See #mdb_set_relfunc and #MDB_rel_func for more details. * See #mdb_set_relfunc and #MDB_rel_func for more details.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] ctx An arbitrary pointer for whatever the application needs. * @param[in] ctx An arbitrary pointer for whatever the application needs.
* It will be passed to the callback function set by #mdb_set_relfunc * It will be passed to the callback function set by #mdb_set_relfunc
* as its \b relctx parameter whenever the callback is invoked. * as its \b relctx parameter whenever the callback is invoked.
@ -900,7 +905,7 @@ int mdb_set_relctx(MDB_txn *txn, MDB_dbi dbi, void *ctx);
* modify it in any way. For values returned in a read-only transaction * modify it in any way. For values returned in a read-only transaction
* any modification attempts will cause a SIGSEGV. * any modification attempts will cause a SIGSEGV.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] key The key to search for in the database * @param[in] key The key to search for in the database
* @param[out] data The data corresponding to the key * @param[out] data The data corresponding to the key
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
@ -919,7 +924,7 @@ int mdb_get(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data);
* if duplicates are disallowed, or adding a duplicate data item if * if duplicates are disallowed, or adding a duplicate data item if
* duplicates are allowed (#MDB_DUPSORT). * duplicates are allowed (#MDB_DUPSORT).
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] key The key to store in the database * @param[in] key The key to store in the database
* @param[in,out] data The data to store * @param[in,out] data The data to store
* @param[in] flags Special options for this operation. This parameter * @param[in] flags Special options for this operation. This parameter
@ -970,7 +975,7 @@ int mdb_put(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data,
* This function will return #MDB_NOTFOUND if the specified key/data * This function will return #MDB_NOTFOUND if the specified key/data
* pair is not in the database. * pair is not in the database.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] key The key to delete from the database * @param[in] key The key to delete from the database
* @param[in] data The data to delete * @param[in] data The data to delete
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
@ -987,7 +992,7 @@ int mdb_del(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data);
* Cursors are associated with a specific transaction and database and * Cursors are associated with a specific transaction and database and
* may not span threads. * may not span threads.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[out] cursor Address where the new #MDB_cursor handle will be stored * @param[out] cursor Address where the new #MDB_cursor handle will be stored
* @return A non-zero error value on failure and 0 on success. Some possible * @return A non-zero error value on failure and 0 on success. Some possible
* errors are: * errors are:
@ -1137,7 +1142,7 @@ int mdb_cursor_count(MDB_cursor *cursor, size_t *countp);
* This returns a comparison as if the two data items were keys in the * This returns a comparison as if the two data items were keys in the
* specified database. * specified database.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] a The first item to compare * @param[in] a The first item to compare
* @param[in] b The second item to compare * @param[in] b The second item to compare
* @return < 0 if a < b, 0 if a == b, > 0 if a > b * @return < 0 if a < b, 0 if a == b, > 0 if a > b
@ -1149,7 +1154,7 @@ int mdb_cmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, const MDB_val *b);
* This returns a comparison as if the two items were data items of * This returns a comparison as if the two items were data items of
* a sorted duplicates #MDB_DUPSORT database. * a sorted duplicates #MDB_DUPSORT database.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
* @param[in] a The first item to compare * @param[in] a The first item to compare
* @param[in] b The second item to compare * @param[in] b The second item to compare
* @return < 0 if a < b, 0 if a == b, > 0 if a > b * @return < 0 if a < b, 0 if a == b, > 0 if a > b

10
libraries/liblmdb/mdb.c
Unescape View File

@ -723,7 +723,7 @@ typedef struct MDB_node {
/** Information about a single database in the environment. */ /** Information about a single database in the environment. */
typedef struct MDB_db { typedef struct MDB_db {
uint32_t md_pad; /**< also ksize for LEAF2 pages */ uint32_t md_pad; /**< also ksize for LEAF2 pages */
uint16_t md_flags; /**< @ref mdb_open */ uint16_t md_flags; /**< @ref mdb_dbi_open */
uint16_t md_depth; /**< depth of this tree */ uint16_t md_depth; /**< depth of this tree */
pgno_t md_branch_pages; /**< number of internal pages */ pgno_t md_branch_pages; /**< number of internal pages */
pgno_t md_leaf_pages; /**< number of leaf pages */ pgno_t md_leaf_pages; /**< number of leaf pages */
@ -6787,7 +6787,7 @@ mdb_env_info(MDB_env *env, MDB_envinfo *arg)
* The user can then override them with #mdb_set_compare() or * The user can then override them with #mdb_set_compare() or
* #mdb_set_dupsort(). * #mdb_set_dupsort().
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_dbi_open()
*/ */
static void static void
mdb_default_cmp(MDB_txn *txn, MDB_dbi dbi) mdb_default_cmp(MDB_txn *txn, MDB_dbi dbi)
@ -6808,7 +6808,7 @@ mdb_default_cmp(MDB_txn *txn, MDB_dbi dbi)
#define PERSISTENT_FLAGS 0xffff #define PERSISTENT_FLAGS 0xffff
#define VALID_FLAGS (MDB_REVERSEKEY|MDB_DUPSORT|MDB_INTEGERKEY|MDB_DUPFIXED|\ #define VALID_FLAGS (MDB_REVERSEKEY|MDB_DUPSORT|MDB_INTEGERKEY|MDB_DUPFIXED|\
MDB_INTEGERDUP|MDB_REVERSEDUP|MDB_CREATE) MDB_INTEGERDUP|MDB_REVERSEDUP|MDB_CREATE)
int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi) int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi)
{ {
MDB_val key, data; MDB_val key, data;
MDB_dbi i; MDB_dbi i;
@ -6914,7 +6914,7 @@ int mdb_stat(MDB_txn *txn, MDB_dbi dbi, MDB_stat *arg)
return mdb_stat0(txn->mt_env, &txn->mt_dbs[dbi], arg); return mdb_stat0(txn->mt_env, &txn->mt_dbs[dbi], arg);
} }
void mdb_close(MDB_env *env, MDB_dbi dbi) void mdb_dbi_close(MDB_env *env, MDB_dbi dbi)
{ {
char *ptr; char *ptr;
if (dbi <= MAIN_DBI || dbi >= env->me_numdbs) if (dbi <= MAIN_DBI || dbi >= env->me_numdbs)
@ -7008,7 +7008,7 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del)
if (del && dbi > MAIN_DBI) { if (del && dbi > MAIN_DBI) {
rc = mdb_del(txn, MAIN_DBI, &mc->mc_dbx->md_name, NULL); rc = mdb_del(txn, MAIN_DBI, &mc->mc_dbx->md_name, NULL);
if (!rc) if (!rc)
mdb_close(txn->mt_env, dbi); mdb_dbi_close(txn->mt_env, dbi);
} else { } else {
/* reset the DB record, mark it dirty */ /* reset the DB record, mark it dirty */
txn->mt_dbflags[dbi] |= DB_DIRTY; txn->mt_dbflags[dbi] |= DB_DIRTY;

Write Preview
Loading…
Cancel
Save