mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-27 03:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2013-08-16 06:44:58 -07:00
commit 9121a473de
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/liblmdb/mdb.c
View File

@ -392,7 +392,7 @@ static txnid_t mdb_debug_start;
*/ */
#define DKEY(x) mdb_dkey(x, kbuf) #define DKEY(x) mdb_dkey(x, kbuf)
#else #else
#define DKBUF typedef int dummy_kbuf /* so we can put ';' after */ #define DKBUF
#define DKEY(x) 0 #define DKEY(x) 0
#endif #endif
@ -756,9 +756,12 @@ typedef struct MDB_node {
*/ */
#define LEAF2KEY(p, i, ks) ((char *)(p) + PAGEHDRSZ + ((i)*(ks))) #define LEAF2KEY(p, i, ks) ((char *)(p) + PAGEHDRSZ + ((i)*(ks)))
/** Set the \b node's key into \b key, if requested. */ /** Set the \b node's key into \b keyptr, if requested. */
#define MDB_GET_KEY(node, key) { if ((key) != NULL) { \ #define MDB_GET_KEY(node, keyptr) { if ((keyptr) != NULL) { \
(key)->mv_size = NODEKSZ(node); (key)->mv_data = NODEKEY(node); } } (keyptr)->mv_size = NODEKSZ(node); (keyptr)->mv_data = NODEKEY(node); } }
/** Set the \b node's key into \b key. */
#define MDB_GET_KEY2(node, key) { key.mv_size = NODEKSZ(node); key.mv_data = NODEKEY(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 {
@ -3137,6 +3140,7 @@ mdb_env_write_meta(MDB_txn *txn)
WriteFile(env->me_fd, ptr, len, NULL, &ov); WriteFile(env->me_fd, ptr, len, NULL, &ov);
#else #else
r2 = pwrite(env->me_fd, ptr, len, off); r2 = pwrite(env->me_fd, ptr, len, off);
(void)r2; /* Silence warnings. We don't care about pwrite's return value */
#endif #endif
fail: fail:
env->me_flags |= MDB_FATAL_ERROR; env->me_flags |= MDB_FATAL_ERROR;
@ -3607,10 +3611,9 @@ static void
mdb_hash_enc(MDB_val *val, char *encbuf) mdb_hash_enc(MDB_val *val, char *encbuf)
{ {
mdb_hash_t h = mdb_hash_val(val, MDB_HASH_INIT); mdb_hash_t h = mdb_hash_val(val, MDB_HASH_INIT);
unsigned long *l = (unsigned long *)&h;
mdb_pack85(l[0], encbuf); mdb_pack85(h, encbuf);
mdb_pack85(l[1], encbuf+5); mdb_pack85(h>>32, encbuf+5);
encbuf[10] = '\0'; encbuf[10] = '\0';
} }
#endif #endif
@ -4533,9 +4536,8 @@ static int
mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int modify) mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int modify)
{ {
MDB_page *mp = mc->mc_pg[mc->mc_top]; MDB_page *mp = mc->mc_pg[mc->mc_top];
DKBUF;
int rc; int rc;
DKBUF;
while (IS_BRANCH(mp)) { while (IS_BRANCH(mp)) {
MDB_node *node; MDB_node *node;
@ -5073,7 +5075,7 @@ mdb_cursor_set(MDB_cursor *mc, MDB_val *key, MDB_val *data,
nodekey.mv_data = LEAF2KEY(mp, 0, nodekey.mv_size); nodekey.mv_data = LEAF2KEY(mp, 0, nodekey.mv_size);
} else { } else {
leaf = NODEPTR(mp, 0); leaf = NODEPTR(mp, 0);
MDB_GET_KEY(leaf, &nodekey); MDB_GET_KEY2(leaf, nodekey);
} }
rc = mc->mc_dbx->md_cmp(key, &nodekey); rc = mc->mc_dbx->md_cmp(key, &nodekey);
if (rc == 0) { if (rc == 0) {
@ -5094,7 +5096,7 @@ mdb_cursor_set(MDB_cursor *mc, MDB_val *key, MDB_val *data,
nkeys-1, nodekey.mv_size); nkeys-1, nodekey.mv_size);
} else { } else {
leaf = NODEPTR(mp, nkeys-1); leaf = NODEPTR(mp, nkeys-1);
MDB_GET_KEY(leaf, &nodekey); MDB_GET_KEY2(leaf, nodekey);
} }
rc = mc->mc_dbx->md_cmp(key, &nodekey); rc = mc->mc_dbx->md_cmp(key, &nodekey);
if (rc == 0) { if (rc == 0) {
@ -5112,7 +5114,7 @@ mdb_cursor_set(MDB_cursor *mc, MDB_val *key, MDB_val *data,
mc->mc_ki[mc->mc_top], nodekey.mv_size); mc->mc_ki[mc->mc_top], nodekey.mv_size);
} else { } else {
leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]); leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]);
MDB_GET_KEY(leaf, &nodekey); MDB_GET_KEY2(leaf, nodekey);
} }
rc = mc->mc_dbx->md_cmp(key, &nodekey); rc = mc->mc_dbx->md_cmp(key, &nodekey);
if (rc == 0) { if (rc == 0) {