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

mdbx: refine dbi_open_ex().

Browse Source 
Change-Id: I32bc1c6609e14ba90b2f4eaf9b8b11ea06f2eb8b
This commit is contained in:
Leonid Yuriev 2020-01-19 14:45:16 +03:00
parent 7d880a37dd
commit 2c1d3a3fda
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elements/core.c
View File

@ -15403,13 +15403,14 @@ static int mdbx_dbi_bind(MDBX_txn *txn, const MDBX_dbi dbi, unsigned user_flags,
int mdbx_dbi_open_ex(MDBX_txn *txn, const char *table_name, unsigned user_flags, int mdbx_dbi_open_ex(MDBX_txn *txn, const char *table_name, unsigned user_flags,
MDBX_dbi *dbi, MDBX_cmp_func *keycmp, MDBX_dbi *dbi, MDBX_cmp_func *keycmp,
MDBX_cmp_func *datacmp) { MDBX_cmp_func *datacmp) {
if (unlikely(!dbi || (user_flags & ~VALID_FLAGS) != 0))
return MDBX_EINVAL;
*dbi = (MDBX_dbi)-1;
int rc = check_txn(txn, MDBX_TXN_BLOCKED); int rc = check_txn(txn, MDBX_TXN_BLOCKED);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
if (unlikely(!dbi || (user_flags & ~VALID_FLAGS) != 0))
return MDBX_EINVAL;
switch (user_flags & switch (user_flags &
(MDBX_INTEGERDUP | MDBX_DUPFIXED | MDBX_DUPSORT | MDBX_REVERSEDUP)) { (MDBX_INTEGERDUP | MDBX_DUPFIXED | MDBX_DUPSORT | MDBX_REVERSEDUP)) {
default: default:
@ -15426,8 +15427,10 @@ int mdbx_dbi_open_ex(MDBX_txn *txn, const char *table_name, unsigned user_flags,
/* main table? */ /* main table? */
if (!table_name) { if (!table_name) {
*dbi = MAIN_DBI; rc = mdbx_dbi_bind(txn, MAIN_DBI, user_flags, keycmp, datacmp);
return mdbx_dbi_bind(txn, MAIN_DBI, user_flags, keycmp, datacmp); if (likely(rc == MDBX_SUCCESS))
*dbi = MAIN_DBI;
return rc;
} }
if (txn->mt_dbxs[MAIN_DBI].md_cmp == NULL) { if (txn->mt_dbxs[MAIN_DBI].md_cmp == NULL) {