upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid compiling debug args with C90 compilers.

Browse source 
Use double DPRINTF() parenthesis, so varargs macros are not needed.
Parenthesize MDB_DEBUG, in case the user defines it as foo || bar.
This commit is contained in:
Hallvard Furuseth 2013-08-10 13:50:10 +02:00
parent 76d31573a4
commit 9c49ef1d71
1 changed files with 145 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

291
libraries/liblmdb/mdb.c
View file

@ -293,33 +293,30 @@ typedef MDB_ID txnid_t;
* @{ * @{
*/ */
#ifndef MDB_DEBUG #ifndef MDB_DEBUG
/** Enable debug output. /** Enable debug output. Needs variable argument macros (a C99 feature).
* Set this to 1 for copious tracing. Set to 2 to add dumps of all IDLs * Set this to 1 for copious tracing. Set to 2 to add dumps of all IDLs
* read from and written to the database (used for free space management). * read from and written to the database (used for free space management).
*/ */
#define MDB_DEBUG 0 #define MDB_DEBUG 0
#endif #endif
#if !(__STDC_VERSION__ >= 199901L || defined(__GNUC__)) #if MDB_DEBUG
# undef MDB_DEBUG
# define MDB_DEBUG 0
# define DPRINTF (void) /* Vararg macros may be unsupported */
#elif MDB_DEBUG
static int mdb_debug; static int mdb_debug;
static txnid_t mdb_debug_start; static txnid_t mdb_debug_start;
/** Print a debug message with printf formatting. */ /** Print a debug message with printf formatting.
# define DPRINTF(fmt, ...) /**< Requires 2 or more args */ \ * Requires double parenthesis around 2 or more args.
((void) ((mdb_debug) && \ */
fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, __VA_ARGS__))) # define DPRINTF(args) ((void) ((mdb_debug) && DPRINTF0 args))
# define DPRINTF0(fmt, ...) \
fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, __VA_ARGS__)
#else #else
# define DPRINTF(fmt, ...) ((void) 0) # define DPRINTF(args) ((void) 0)
# define MDB_DEBUG_SKIP
#endif #endif
/** Print a debug string. /** Print a debug string.
* The string is printed literally, with no format processing. * The string is printed literally, with no format processing.
*/ */
#define DPUTS(arg) DPRINTF("%s", arg) #define DPUTS(arg) DPRINTF(("%s", arg))
/** @} */ /** @} */
/** A default memory page size. /** A default memory page size.
@ -1225,7 +1222,7 @@ mdb_cursor_chk(MDB_cursor *mc)
} }
#endif #endif
#if MDB_DEBUG > 2 #if (MDB_DEBUG) > 2
/** Count all the pages in each DB and in the freelist /** Count all the pages in each DB and in the freelist
* and make sure it matches the actual number of pages * and make sure it matches the actual number of pages
* being used. * being used.
@ -1674,11 +1671,11 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
mop = env->me_pghead; mop = env->me_pghead;
} }
env->me_pglast = last; env->me_pglast = last;
#if MDB_DEBUG > 1 #if (MDB_DEBUG) > 1
DPRINTF("IDL read txn %"Z"u root %"Z"u num %u", DPRINTF(("IDL read txn %"Z"u root %"Z"u num %u",
last, txn->mt_dbs[FREE_DBI].md_root, i); last, txn->mt_dbs[FREE_DBI].md_root, i));
for (k = i; k; k--) for (k = i; k; k--)
DPRINTF("IDL %"Z"u", idl[k]); DPRINTF(("IDL %"Z"u", idl[k]));
#endif #endif
/* Merge in descending sorted order */ /* Merge in descending sorted order */
j = mop_len; j = mop_len;
@ -1846,7 +1843,7 @@ mdb_page_touch(MDB_cursor *mc)
(rc = mdb_page_alloc(mc, 1, &np))) (rc = mdb_page_alloc(mc, 1, &np)))
return rc; return rc;
pgno = np->mp_pgno; pgno = np->mp_pgno;
DPRINTF("touched db %u page %"Z"u -> %"Z"u", mc->mc_dbi,mp->mp_pgno,pgno); DPRINTF(("touched db %u page %"Z"u -> %"Z"u", mc->mc_dbi,mp->mp_pgno,pgno));
assert(mp->mp_pgno != pgno); assert(mp->mp_pgno != pgno);
mdb_midl_xappend(txn->mt_free_pgs, mp->mp_pgno); mdb_midl_xappend(txn->mt_free_pgs, mp->mp_pgno);
/* Update the parent page, if any, to point to the new page */ /* Update the parent page, if any, to point to the new page */
@ -2019,7 +2016,7 @@ mdb_cursors_close(MDB_txn *txn, unsigned merge)
} }
} }
#ifdef MDB_DEBUG_SKIP #if !(MDB_DEBUG)
#define mdb_txn_reset0(txn, act) mdb_txn_reset0(txn) #define mdb_txn_reset0(txn, act) mdb_txn_reset0(txn)
#endif #endif
static void static void
@ -2204,9 +2201,9 @@ mdb_txn_renew(MDB_txn *txn)
rc = mdb_txn_renew0(txn); rc = mdb_txn_renew0(txn);
if (rc == MDB_SUCCESS) { if (rc == MDB_SUCCESS) {
DPRINTF("renew txn %"Z"u%c %p on mdbenv %p, root page %"Z"u", DPRINTF(("renew txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w', txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w',
(void *)txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root); (void *)txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root));
} }
return rc; return rc;
} }
@ -2240,7 +2237,7 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
size += env->me_maxdbs * sizeof(MDB_cursor *); size += env->me_maxdbs * sizeof(MDB_cursor *);
if ((txn = calloc(1, size)) == NULL) { if ((txn = calloc(1, size)) == NULL) {
DPRINTF("calloc: %s", strerror(ErrCode())); DPRINTF(("calloc: %s", strerror(ErrCode())));
return ENOMEM; return ENOMEM;
} }
txn->mt_dbs = (MDB_db *) ((char *)txn + tsize); txn->mt_dbs = (MDB_db *) ((char *)txn + tsize);
@ -2300,9 +2297,9 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
free(txn); free(txn);
else { else {
*ret = txn; *ret = txn;
DPRINTF("begin txn %"Z"u%c %p on mdbenv %p, root page %"Z"u", DPRINTF(("begin txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w', txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w',
(void *) txn, (void *) env, txn->mt_dbs[MAIN_DBI].md_root); (void *) txn, (void *) env, txn->mt_dbs[MAIN_DBI].md_root));
} }
return rc; return rc;
@ -2354,9 +2351,9 @@ mdb_txn_reset0(MDB_txn *txn, const char *act)
/* Close any DBI handles opened in this txn */ /* Close any DBI handles opened in this txn */
mdb_dbis_update(txn, 0); mdb_dbis_update(txn, 0);
DPRINTF("%s txn %"Z"u%c %p on mdbenv %p, root page %"Z"u", DPRINTF(("%s txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
act, txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w', act, txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w',
(void *) txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root); (void *) txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root));
if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) { if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) {
if (txn->mt_u.reader) { if (txn->mt_u.reader) {
@ -2494,13 +2491,13 @@ mdb_freelist_save(MDB_txn *txn)
} while (freecnt < free_pgs[0]); } while (freecnt < free_pgs[0]);
mdb_midl_sort(free_pgs); mdb_midl_sort(free_pgs);
memcpy(data.mv_data, free_pgs, data.mv_size); memcpy(data.mv_data, free_pgs, data.mv_size);
#if MDB_DEBUG > 1 #if (MDB_DEBUG) > 1
{ {
unsigned int i = free_pgs[0]; unsigned int i = free_pgs[0];
DPRINTF("IDL write txn %"Z"u root %"Z"u num %u", DPRINTF(("IDL write txn %"Z"u root %"Z"u num %u",
txn->mt_txnid, txn->mt_dbs[FREE_DBI].md_root, i); txn->mt_txnid, txn->mt_dbs[FREE_DBI].md_root, i));
for (; i; i--) for (; i; i--)
DPRINTF("IDL %"Z"u", free_pgs[i]); DPRINTF(("IDL %"Z"u", free_pgs[i]));
} }
#endif #endif
continue; continue;
@ -2639,13 +2636,13 @@ mdb_page_flush(MDB_txn *txn)
* the write offset, to at least save the overhead of a Seek * the write offset, to at least save the overhead of a Seek
* system call. * system call.
*/ */
DPRINTF("committing page %"Z"u", pgno); DPRINTF(("committing page %"Z"u", pgno));
memset(&ov, 0, sizeof(ov)); memset(&ov, 0, sizeof(ov));
ov.Offset = pos & 0xffffffff; ov.Offset = pos & 0xffffffff;
ov.OffsetHigh = pos >> 16 >> 16; ov.OffsetHigh = pos >> 16 >> 16;
if (!WriteFile(env->me_fd, dp, size, NULL, &ov)) { if (!WriteFile(env->me_fd, dp, size, NULL, &ov)) {
rc = ErrCode(); rc = ErrCode();
DPRINTF("WriteFile: %d", rc); DPRINTF(("WriteFile: %d", rc));
return rc; return rc;
} }
#else #else
@ -2661,7 +2658,7 @@ mdb_page_flush(MDB_txn *txn)
} else { } else {
if (lseek(env->me_fd, wpos, SEEK_SET) == -1) { if (lseek(env->me_fd, wpos, SEEK_SET) == -1) {
rc = ErrCode(); rc = ErrCode();
DPRINTF("lseek: %s", strerror(rc)); DPRINTF(("lseek: %s", strerror(rc)));
return rc; return rc;
} }
wres = writev(env->me_fd, iov, n); wres = writev(env->me_fd, iov, n);
@ -2670,7 +2667,7 @@ mdb_page_flush(MDB_txn *txn)
if (wres != wsize) { if (wres != wsize) {
if (wres < 0) { if (wres < 0) {
rc = ErrCode(); rc = ErrCode();
DPRINTF("Write error: %s", strerror(rc)); DPRINTF(("Write error: %s", strerror(rc)));
} else { } else {
rc = EIO; /* TODO: Use which error code? */ rc = EIO; /* TODO: Use which error code? */
DPUTS("short write, filesystem full?"); DPUTS("short write, filesystem full?");
@ -2684,7 +2681,7 @@ mdb_page_flush(MDB_txn *txn)
wpos = pos; wpos = pos;
wsize = 0; wsize = 0;
} }
DPRINTF("committing page %"Z"u", pgno); DPRINTF(("committing page %"Z"u", pgno));
next_pos = pos + size; next_pos = pos + size;
iov[n].iov_len = size; iov[n].iov_len = size;
iov[n].iov_base = (char *)dp; iov[n].iov_base = (char *)dp;
@ -2863,8 +2860,8 @@ mdb_txn_commit(MDB_txn *txn)
!(txn->mt_flags & (MDB_TXN_DIRTY|MDB_TXN_SPILLS))) !(txn->mt_flags & (MDB_TXN_DIRTY|MDB_TXN_SPILLS)))
goto done; goto done;
DPRINTF("committing txn %"Z"u %p on mdbenv %p, root page %"Z"u", DPRINTF(("committing txn %"Z"u %p on mdbenv %p, root page %"Z"u",
txn->mt_txnid, (void *)txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root); txn->mt_txnid, (void*)txn, (void*)env, txn->mt_dbs[MAIN_DBI].md_root));
/* Update DB root pointers */ /* Update DB root pointers */
if (txn->mt_numdbs > 2) { if (txn->mt_numdbs > 2) {
@ -2893,7 +2890,7 @@ mdb_txn_commit(MDB_txn *txn)
if (mdb_midl_shrink(&txn->mt_free_pgs)) if (mdb_midl_shrink(&txn->mt_free_pgs))
env->me_free_pgs = txn->mt_free_pgs; env->me_free_pgs = txn->mt_free_pgs;
#if MDB_DEBUG > 2 #if (MDB_DEBUG) > 2
mdb_audit(txn); mdb_audit(txn);
#endif #endif
@ -2951,14 +2948,14 @@ mdb_env_read_header(MDB_env *env, MDB_meta *meta)
if (rc == 0 && off == 0) if (rc == 0 && off == 0)
return ENOENT; return ENOENT;
rc = rc < 0 ? (int) ErrCode() : MDB_INVALID; rc = rc < 0 ? (int) ErrCode() : MDB_INVALID;
DPRINTF("read: %s", mdb_strerror(rc)); DPRINTF(("read: %s", mdb_strerror(rc)));
return rc; return rc;
} }
p = (MDB_page *)&pbuf; p = (MDB_page *)&pbuf;
if (!F_ISSET(p->mp_flags, P_META)) { if (!F_ISSET(p->mp_flags, P_META)) {
DPRINTF("page %"Z"u not a meta page", p->mp_pgno); DPRINTF(("page %"Z"u not a meta page", p->mp_pgno));
return MDB_INVALID; return MDB_INVALID;
} }
@ -2969,8 +2966,8 @@ mdb_env_read_header(MDB_env *env, MDB_meta *meta)
} }
if (m->mm_version != MDB_DATA_VERSION) { if (m->mm_version != MDB_DATA_VERSION) {
DPRINTF("database is version %u, expected version %u", DPRINTF(("database is version %u, expected version %u",
m->mm_version, MDB_DATA_VERSION); m->mm_version, MDB_DATA_VERSION));
return MDB_VERSION_MISMATCH; return MDB_VERSION_MISMATCH;
} }
@ -3063,8 +3060,8 @@ mdb_env_write_meta(MDB_txn *txn)
assert(txn->mt_env != NULL); assert(txn->mt_env != NULL);
toggle = !txn->mt_toggle; toggle = !txn->mt_toggle;
DPRINTF("writing meta page %d for root page %"Z"u", DPRINTF(("writing meta page %d for root page %"Z"u",
toggle, txn->mt_dbs[MAIN_DBI].md_root); toggle, txn->mt_dbs[MAIN_DBI].md_root));
env = txn->mt_env; env = txn->mt_env;
mp = env->me_metas[toggle]; mp = env->me_metas[toggle];
@ -3357,15 +3354,15 @@ mdb_env_open2(MDB_env *env)
int toggle = mdb_env_pick_meta(env); int toggle = mdb_env_pick_meta(env);
MDB_db *db = &env->me_metas[toggle]->mm_dbs[MAIN_DBI]; MDB_db *db = &env->me_metas[toggle]->mm_dbs[MAIN_DBI];
DPRINTF("opened database version %u, pagesize %u", DPRINTF(("opened database version %u, pagesize %u",
env->me_metas[0]->mm_version, env->me_psize); env->me_metas[0]->mm_version, env->me_psize));
DPRINTF("using meta page %d", toggle); DPRINTF(("using meta page %d", toggle));
DPRINTF("depth: %u", db->md_depth); DPRINTF(("depth: %u", db->md_depth));
DPRINTF("entries: %"Z"u", db->md_entries); DPRINTF(("entries: %"Z"u", db->md_entries));
DPRINTF("branch pages: %"Z"u", db->md_branch_pages); DPRINTF(("branch pages: %"Z"u", db->md_branch_pages));
DPRINTF("leaf pages: %"Z"u", db->md_leaf_pages); DPRINTF(("leaf pages: %"Z"u", db->md_leaf_pages));
DPRINTF("overflow pages: %"Z"u", db->md_overflow_pages); DPRINTF(("overflow pages: %"Z"u", db->md_overflow_pages));
DPRINTF("root: %"Z"u", db->md_root); DPRINTF(("root: %"Z"u", db->md_root));
} }
#endif #endif
@ -3809,8 +3806,8 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
goto fail; goto fail;
} }
if (env->me_txns->mti_format != MDB_LOCK_FORMAT) { if (env->me_txns->mti_format != MDB_LOCK_FORMAT) {
DPRINTF("lock region has format+version 0x%x, expected 0x%x", DPRINTF(("lock region has format+version 0x%x, expected 0x%x",
env->me_txns->mti_format, MDB_LOCK_FORMAT); env->me_txns->mti_format, MDB_LOCK_FORMAT));
rc = MDB_VERSION_MISMATCH; rc = MDB_VERSION_MISMATCH;
goto fail; goto fail;
} }
@ -3948,7 +3945,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mdb_mode_t mode
goto leave; goto leave;
} }
} }
DPRINTF("opened dbenv %p", (void *) env); DPRINTF(("opened dbenv %p", (void *) env));
if (excl > 0) { if (excl > 0) {
rc = mdb_env_share_locks(env, &excl); rc = mdb_env_share_locks(env, &excl);
} }
@ -4321,9 +4318,9 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
{ {
pgno_t pgno; pgno_t pgno;
COPY_PGNO(pgno, mp->mp_pgno); COPY_PGNO(pgno, mp->mp_pgno);
DPRINTF("searching %u keys in %s %spage %"Z"u", DPRINTF(("searching %u keys in %s %spage %"Z"u",
nkeys, IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "", nkeys, IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "",
pgno); pgno));
} }
#endif #endif
@ -4350,8 +4347,8 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
i = (low + high) >> 1; i = (low + high) >> 1;
nodekey.mv_data = LEAF2KEY(mp, i, nodekey.mv_size); nodekey.mv_data = LEAF2KEY(mp, i, nodekey.mv_size);
rc = cmp(key, &nodekey); rc = cmp(key, &nodekey);
DPRINTF("found leaf index %u [%s], rc = %i", DPRINTF(("found leaf index %u [%s], rc = %i",
i, DKEY(&nodekey), rc); i, DKEY(&nodekey), rc));
if (rc == 0) if (rc == 0)
break; break;
if (rc > 0) if (rc > 0)
@ -4370,11 +4367,11 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
rc = cmp(key, &nodekey); rc = cmp(key, &nodekey);
#if MDB_DEBUG #if MDB_DEBUG
if (IS_LEAF(mp)) if (IS_LEAF(mp))
DPRINTF("found leaf index %u [%s], rc = %i", DPRINTF(("found leaf index %u [%s], rc = %i",
i, DKEY(&nodekey), rc); i, DKEY(&nodekey), rc));
else else
DPRINTF("found branch index %u [%s -> %"Z"u], rc = %i", DPRINTF(("found branch index %u [%s -> %"Z"u], rc = %i",
i, DKEY(&nodekey), NODEPGNO(node), rc); i, DKEY(&nodekey), NODEPGNO(node), rc));
#endif #endif
if (rc == 0) if (rc == 0)
break; break;
@ -4421,15 +4418,15 @@ static void
mdb_cursor_pop(MDB_cursor *mc) mdb_cursor_pop(MDB_cursor *mc)
{ {
if (mc->mc_snum) { if (mc->mc_snum) {
#ifndef MDB_DEBUG_SKIP #if MDB_DEBUG
MDB_page *top = mc->mc_pg[mc->mc_top]; MDB_page *top = mc->mc_pg[mc->mc_top];
#endif #endif
mc->mc_snum--; mc->mc_snum--;
if (mc->mc_snum) if (mc->mc_snum)
mc->mc_top--; mc->mc_top--;
DPRINTF("popped page %"Z"u off db %u cursor %p", top->mp_pgno, DPRINTF(("popped page %"Z"u off db %u cursor %p", top->mp_pgno,
mc->mc_dbi, (void *) mc); mc->mc_dbi, (void *) mc));
} }
} }
@ -4437,8 +4434,8 @@ mdb_cursor_pop(MDB_cursor *mc)
static int static int
mdb_cursor_push(MDB_cursor *mc, MDB_page *mp) mdb_cursor_push(MDB_cursor *mc, MDB_page *mp)
{ {
DPRINTF("pushing page %"Z"u on db %u cursor %p", mp->mp_pgno, DPRINTF(("pushing page %"Z"u on db %u cursor %p", mp->mp_pgno,
mc->mc_dbi, (void *) mc); mc->mc_dbi, (void *) mc));
if (mc->mc_snum >= CURSOR_STACK) { if (mc->mc_snum >= CURSOR_STACK) {
assert(mc->mc_snum < CURSOR_STACK); assert(mc->mc_snum < CURSOR_STACK);
@ -4499,7 +4496,7 @@ mdb_page_get(MDB_txn *txn, pgno_t pgno, MDB_page **ret, int *lvl)
level = 0; level = 0;
p = (MDB_page *)(env->me_map + env->me_psize * pgno); p = (MDB_page *)(env->me_map + env->me_psize * pgno);
} else { } else {
DPRINTF("page %"Z"u not found", pgno); DPRINTF(("page %"Z"u not found", pgno));
assert(p != NULL); assert(p != NULL);
return MDB_PAGE_NOTFOUND; return MDB_PAGE_NOTFOUND;
} }
@ -4533,9 +4530,9 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int modify)
MDB_node *node; MDB_node *node;
indx_t i; indx_t i;
DPRINTF("branch page %"Z"u has %u keys", mp->mp_pgno, NUMKEYS(mp)); DPRINTF(("branch page %"Z"u has %u keys", mp->mp_pgno, NUMKEYS(mp)));
assert(NUMKEYS(mp) > 1); assert(NUMKEYS(mp) > 1);
DPRINTF("found index 0 to page %"Z"u", NODEPGNO(NODEPTR(mp, 0))); DPRINTF(("found index 0 to page %"Z"u", NODEPGNO(NODEPTR(mp, 0))));
if (key == NULL) /* Initialize cursor to first page. */ if (key == NULL) /* Initialize cursor to first page. */
i = 0; i = 0;
@ -4557,8 +4554,7 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int modify)
} }
if (key) if (key)
DPRINTF("following index %u for key [%s]", DPRINTF(("following index %u for key [%s]", i, DKEY(key)));
i, DKEY(key));
assert(i < NUMKEYS(mp)); assert(i < NUMKEYS(mp));
node = NODEPTR(mp, i); node = NODEPTR(mp, i);
@ -4577,13 +4573,13 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int modify)
} }
if (!IS_LEAF(mp)) { if (!IS_LEAF(mp)) {
DPRINTF("internal error, index points to a %02X page!?", DPRINTF(("internal error, index points to a %02X page!?",
mp->mp_flags); mp->mp_flags));
return MDB_CORRUPTED; return MDB_CORRUPTED;
} }
DPRINTF("found leaf page %"Z"u for key [%s]", mp->mp_pgno, DPRINTF(("found leaf page %"Z"u for key [%s]", mp->mp_pgno,
key ? DKEY(key) : NULL); key ? DKEY(key) : NULL));
mc->mc_flags |= C_INITIALIZED; mc->mc_flags |= C_INITIALIZED;
mc->mc_flags &= ~C_EOF; mc->mc_flags &= ~C_EOF;
@ -4689,8 +4685,8 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
mc->mc_snum = 1; mc->mc_snum = 1;
mc->mc_top = 0; mc->mc_top = 0;
DPRINTF("db %u root page %"Z"u has flags 0x%X", DPRINTF(("db %u root page %"Z"u has flags 0x%X",
mc->mc_dbi, root, mc->mc_pg[0]->mp_flags); mc->mc_dbi, root, mc->mc_pg[0]->mp_flags));
if (flags & MDB_PS_MODIFY) { if (flags & MDB_PS_MODIFY) {
if ((rc = mdb_page_touch(mc))) if ((rc = mdb_page_touch(mc)))
@ -4713,7 +4709,7 @@ mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp)
MDB_IDL sl = txn->mt_spill_pgs; MDB_IDL sl = txn->mt_spill_pgs;
int rc; int rc;
DPRINTF("free ov page %"Z"u (%d)", pg, ovpages); DPRINTF(("free ov page %"Z"u (%d)", pg, ovpages));
/* If the page is dirty or on the spill list we just acquired it, /* If the page is dirty or on the spill list we just acquired it,
* so we should give it back to our current free list, if any. * so we should give it back to our current free list, if any.
* Otherwise put it onto the list of pages we freed in this txn. * Otherwise put it onto the list of pages we freed in this txn.
@ -4800,7 +4796,7 @@ mdb_node_read(MDB_txn *txn, MDB_node *leaf, MDB_val *data)
data->mv_size = NODEDSZ(leaf); data->mv_size = NODEDSZ(leaf);
memcpy(&pgno, NODEDATA(leaf), sizeof(pgno)); memcpy(&pgno, NODEDATA(leaf), sizeof(pgno));
if ((rc = mdb_page_get(txn, pgno, &omp, NULL)) != 0) { if ((rc = mdb_page_get(txn, pgno, &omp, NULL)) != 0) {
DPRINTF("read overflow page %"Z"u failed", pgno); DPRINTF(("read overflow page %"Z"u failed", pgno));
return rc; return rc;
} }
data->mv_data = METADATA(omp); data->mv_data = METADATA(omp);
@ -4819,7 +4815,7 @@ mdb_get(MDB_txn *txn, MDB_dbi dbi,
assert(key); assert(key);
assert(data); assert(data);
DPRINTF("===> get db %u key [%s]", dbi, DKEY(key)); DPRINTF(("===> get db %u key [%s]", dbi, DKEY(key)));
if (txn == NULL || !dbi || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID)) if (txn == NULL || !dbi || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID))
return EINVAL; return EINVAL;
@ -4855,13 +4851,13 @@ mdb_cursor_sibling(MDB_cursor *mc, int move_right)
} }
mdb_cursor_pop(mc); mdb_cursor_pop(mc);
DPRINTF("parent page is page %"Z"u, index %u", DPRINTF(("parent page is page %"Z"u, index %u",
mc->mc_pg[mc->mc_top]->mp_pgno, mc->mc_ki[mc->mc_top]); mc->mc_pg[mc->mc_top]->mp_pgno, mc->mc_ki[mc->mc_top]));
if (move_right ? (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mc->mc_pg[mc->mc_top])) if (move_right ? (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mc->mc_pg[mc->mc_top]))
: (mc->mc_ki[mc->mc_top] == 0)) { : (mc->mc_ki[mc->mc_top] == 0)) {
DPRINTF("no more keys left, moving to %s sibling", DPRINTF(("no more keys left, moving to %s sibling",
move_right ? "right" : "left"); move_right ? "right" : "left"));
if ((rc = mdb_cursor_sibling(mc, move_right)) != MDB_SUCCESS) { if ((rc = mdb_cursor_sibling(mc, move_right)) != MDB_SUCCESS) {
/* undo cursor_pop before returning */ /* undo cursor_pop before returning */
mc->mc_top++; mc->mc_top++;
@ -4873,8 +4869,8 @@ mdb_cursor_sibling(MDB_cursor *mc, int move_right)
mc->mc_ki[mc->mc_top]++; mc->mc_ki[mc->mc_top]++;
else else
mc->mc_ki[mc->mc_top]--; mc->mc_ki[mc->mc_top]--;
DPRINTF("just moving to %s index key %u", DPRINTF(("just moving to %s index key %u",
move_right ? "right" : "left", mc->mc_ki[mc->mc_top]); move_right ? "right" : "left", mc->mc_ki[mc->mc_top]));
} }
assert(IS_BRANCH(mc->mc_pg[mc->mc_top])); assert(IS_BRANCH(mc->mc_pg[mc->mc_top]));
@ -4920,7 +4916,7 @@ mdb_cursor_next(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
} }
} }
DPRINTF("cursor_next: top page is %"Z"u in cursor %p", mp->mp_pgno, (void *) mc); DPRINTF(("cursor_next: top page is %"Z"u in cursor %p", mp->mp_pgno, (void *) mc));
if (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mp)) { if (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mp)) {
DPUTS("=====> move to next sibling page"); DPUTS("=====> move to next sibling page");
@ -4929,12 +4925,12 @@ mdb_cursor_next(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
return rc; return rc;
} }
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
DPRINTF("next page is %"Z"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]); DPRINTF(("next page is %"Z"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]));
} else } else
mc->mc_ki[mc->mc_top]++; mc->mc_ki[mc->mc_top]++;
DPRINTF("==> cursor points to page %"Z"u with %u keys, key index %u", DPRINTF(("==> cursor points to page %"Z"u with %u keys, key index %u",
mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]); mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]));
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
key->mv_size = mc->mc_db->md_pad; key->mv_size = mc->mc_db->md_pad;
@ -4990,7 +4986,7 @@ mdb_cursor_prev(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
} }
} }
DPRINTF("cursor_prev: top page is %"Z"u in cursor %p", mp->mp_pgno, (void *) mc); DPRINTF(("cursor_prev: top page is %"Z"u in cursor %p", mp->mp_pgno, (void *) mc));
if (mc->mc_ki[mc->mc_top] == 0) { if (mc->mc_ki[mc->mc_top] == 0) {
DPUTS("=====> move to prev sibling page"); DPUTS("=====> move to prev sibling page");
@ -4999,14 +4995,14 @@ mdb_cursor_prev(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
} }
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
mc->mc_ki[mc->mc_top] = NUMKEYS(mp) - 1; mc->mc_ki[mc->mc_top] = NUMKEYS(mp) - 1;
DPRINTF("prev page is %"Z"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]); DPRINTF(("prev page is %"Z"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]));
} else } else
mc->mc_ki[mc->mc_top]--; mc->mc_ki[mc->mc_top]--;
mc->mc_flags &= ~C_EOF; mc->mc_flags &= ~C_EOF;
DPRINTF("==> cursor points to page %"Z"u with %u keys, key index %u", DPRINTF(("==> cursor points to page %"Z"u with %u keys, key index %u",
mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]); mp->mp_pgno, NUMKEYS(mp), mc->mc_ki[mc->mc_top]));
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
key->mv_size = mc->mc_db->md_pad; key->mv_size = mc->mc_db->md_pad;
@ -5212,7 +5208,7 @@ set1:
/* The key already matches in all other cases */ /* The key already matches in all other cases */
if (op == MDB_SET_RANGE || op == MDB_SET_KEY) if (op == MDB_SET_RANGE || op == MDB_SET_KEY)
MDB_GET_KEY(leaf, key); MDB_GET_KEY(leaf, key);
DPRINTF("==> cursor placed on key [%s]", DKEY(key)); DPRINTF(("==> cursor placed on key [%s]", DKEY(key)));
return rc; return rc;
} }
@ -5463,7 +5459,7 @@ fetchm:
mfunc = mdb_cursor_last; mfunc = mdb_cursor_last;
goto mmove; goto mmove;
default: default:
DPRINTF("unhandled/unimplemented cursor operation %u", op); DPRINTF(("unhandled/unimplemented cursor operation %u", op));
rc = EINVAL; rc = EINVAL;
break; break;
} }
@ -5546,8 +5542,8 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
return MDB_BAD_VALSIZE; return MDB_BAD_VALSIZE;
#endif #endif
DPRINTF("==> put db %u key [%s], size %"Z"u, data size %"Z"u", DPRINTF(("==> put db %u key [%s], size %"Z"u, data size %"Z"u",
mc->mc_dbi, DKEY(key), key ? key->mv_size:0, data->mv_size); mc->mc_dbi, DKEY(key), key ? key->mv_size:0, data->mv_size));
dkey.mv_size = 0; dkey.mv_size = 0;
@ -5580,7 +5576,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
rc = mdb_cursor_set(mc, key, &d2, MDB_SET, &exact); rc = mdb_cursor_set(mc, key, &d2, MDB_SET, &exact);
} }
if ((flags & MDB_NOOVERWRITE) && rc == 0) { if ((flags & MDB_NOOVERWRITE) && rc == 0) {
DPRINTF("duplicate key [%s]", DKEY(key)); DPRINTF(("duplicate key [%s]", DKEY(key)));
*data = d2; *data = d2;
return MDB_KEYEXIST; return MDB_KEYEXIST;
} }
@ -5841,7 +5837,7 @@ current:
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0); mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
mc->mc_db->md_entries--; mc->mc_db->md_entries--;
} else { } else {
DPRINTF("inserting key at index %i", mc->mc_ki[mc->mc_top]); DPRINTF(("inserting key at index %i", mc->mc_ki[mc->mc_top]));
insert = 1; insert = 1;
} }
@ -6043,8 +6039,8 @@ mdb_page_new(MDB_cursor *mc, uint32_t flags, int num, MDB_page **mp)
if ((rc = mdb_page_alloc(mc, num, &np))) if ((rc = mdb_page_alloc(mc, num, &np)))
return rc; return rc;
DPRINTF("allocated new mpage %"Z"u, page size %u", DPRINTF(("allocated new mpage %"Z"u, page size %u",
np->mp_pgno, mc->mc_txn->mt_env->me_psize); np->mp_pgno, mc->mc_txn->mt_env->me_psize));
np->mp_flags = flags | P_DIRTY; np->mp_flags = flags | P_DIRTY;
np->mp_lower = PAGEHDRSZ; np->mp_lower = PAGEHDRSZ;
np->mp_upper = mc->mc_txn->mt_env->me_psize; np->mp_upper = mc->mc_txn->mt_env->me_psize;
@ -6142,11 +6138,11 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
assert(mp->mp_upper >= mp->mp_lower); assert(mp->mp_upper >= mp->mp_lower);
DPRINTF("add to %s %spage %"Z"u index %i, data size %"Z"u key size %"Z"u [%s]", DPRINTF(("add to %s %spage %"Z"u index %i, data size %"Z"u key size %"Z"u [%s]",
IS_LEAF(mp) ? "leaf" : "branch", IS_LEAF(mp) ? "leaf" : "branch",
IS_SUBP(mp) ? "sub-" : "", IS_SUBP(mp) ? "sub-" : "",
mp->mp_pgno, indx, data ? data->mv_size : 0, mp->mp_pgno, indx, data ? data->mv_size : 0,
key ? key->mv_size : 0, key ? DKEY(key) : NULL); key ? key->mv_size : 0, key ? DKEY(key) : NULL));
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
/* Move higher keys up one slot. */ /* Move higher keys up one slot. */
@ -6176,12 +6172,12 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
int ovpages = OVPAGES(data->mv_size, mc->mc_txn->mt_env->me_psize); int ovpages = OVPAGES(data->mv_size, mc->mc_txn->mt_env->me_psize);
int rc; int rc;
/* Put data on overflow page. */ /* Put data on overflow page. */
DPRINTF("data size is %"Z"u, node would be %"Z"u, put data on overflow page", DPRINTF(("data size is %"Z"u, node would be %"Z"u, put data on overflow page",
data->mv_size, node_size+data->mv_size); data->mv_size, node_size+data->mv_size));
node_size += sizeof(pgno_t); node_size += sizeof(pgno_t);
if ((rc = mdb_page_new(mc, P_OVERFLOW, ovpages, &ofp))) if ((rc = mdb_page_new(mc, P_OVERFLOW, ovpages, &ofp)))
return rc; return rc;
DPRINTF("allocated overflow page %"Z"u", ofp->mp_pgno); DPRINTF(("allocated overflow page %"Z"u", ofp->mp_pgno));
flags |= F_BIGDATA; flags |= F_BIGDATA;
} else { } else {
node_size += data->mv_size; node_size += data->mv_size;
@ -6190,11 +6186,11 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
node_size += node_size & 1; node_size += node_size & 1;
if (node_size + sizeof(indx_t) > SIZELEFT(mp)) { if (node_size + sizeof(indx_t) > SIZELEFT(mp)) {
DPRINTF("not enough room in page %"Z"u, got %u ptrs", DPRINTF(("not enough room in page %"Z"u, got %u ptrs",
mp->mp_pgno, NUMKEYS(mp)); mp->mp_pgno, NUMKEYS(mp)));
DPRINTF("upper - lower = %u - %u = %u", mp->mp_upper, mp->mp_lower, DPRINTF(("upper - lower = %u - %u = %u", mp->mp_upper, mp->mp_lower,
mp->mp_upper - mp->mp_lower); mp->mp_upper - mp->mp_lower));
DPRINTF("node size = %"Z"u", node_size); DPRINTF(("node size = %"Z"u", node_size));
return MDB_PAGE_FULL; return MDB_PAGE_FULL;
} }
@ -6263,8 +6259,8 @@ mdb_node_del(MDB_page *mp, indx_t indx, int ksize)
{ {
pgno_t pgno; pgno_t pgno;
COPY_PGNO(pgno, mp->mp_pgno); COPY_PGNO(pgno, mp->mp_pgno);
DPRINTF("delete node %u on %s page %"Z"u", indx, DPRINTF(("delete node %u on %s page %"Z"u", indx,
IS_LEAF(mp) ? "leaf" : "branch", pgno); IS_LEAF(mp) ? "leaf" : "branch", pgno));
} }
#endif #endif
assert(indx < NUMKEYS(mp)); assert(indx < NUMKEYS(mp));
@ -6425,8 +6421,8 @@ mdb_xcursor_init1(MDB_cursor *mc, MDB_node *node)
mx->mx_db.md_flags |= MDB_INTEGERKEY; mx->mx_db.md_flags |= MDB_INTEGERKEY;
} }
} }
DPRINTF("Sub-db %u for db %u root page %"Z"u", mx->mx_cursor.mc_dbi, mc->mc_dbi, DPRINTF(("Sub-db %u for db %u root page %"Z"u", mx->mx_cursor.mc_dbi, mc->mc_dbi,
mx->mx_db.md_root); mx->mx_db.md_root));
mx->mx_dbflag = DB_VALID | (F_ISSET(mc->mc_pg[mc->mc_top]->mp_flags, P_DIRTY) ? mx->mx_dbflag = DB_VALID | (F_ISSET(mc->mc_pg[mc->mc_top]->mp_flags, P_DIRTY) ?
DB_DIRTY : 0); DB_DIRTY : 0);
mx->mx_dbx.md_name.mv_data = NODEKEY(node); mx->mx_dbx.md_name.mv_data = NODEKEY(node);
@ -6595,11 +6591,11 @@ mdb_update_key(MDB_cursor *mc, MDB_val *key)
char kbuf2[(MDB_MAXKEYSIZE*2+1)]; char kbuf2[(MDB_MAXKEYSIZE*2+1)];
k2.mv_data = NODEKEY(node); k2.mv_data = NODEKEY(node);
k2.mv_size = node->mn_ksize; k2.mv_size = node->mn_ksize;
DPRINTF("update key %u (ofs %u) [%s] to [%s] on page %"Z"u", DPRINTF(("update key %u (ofs %u) [%s] to [%s] on page %"Z"u",
indx, ptr, indx, ptr,
mdb_dkey(&k2, kbuf2), mdb_dkey(&k2, kbuf2),
DKEY(key), DKEY(key),
mp->mp_pgno); mp->mp_pgno));
} }
#endif #endif
@ -6613,7 +6609,7 @@ mdb_update_key(MDB_cursor *mc, MDB_val *key)
if (delta > 0 && SIZELEFT(mp) < delta) { if (delta > 0 && SIZELEFT(mp) < delta) {
pgno_t pgno; pgno_t pgno;
/* not enough space left, do a delete and split */ /* not enough space left, do a delete and split */
DPRINTF("Not enough room, delta = %d, splitting...", delta); DPRINTF(("Not enough room, delta = %d, splitting...", delta));
pgno = NODEPGNO(node); pgno = NODEPGNO(node);
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0); mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
return mdb_page_split(mc, key, NULL, pgno, MDB_SPLIT_REPLACE); return mdb_page_split(mc, key, NULL, pgno, MDB_SPLIT_REPLACE);
@ -6723,12 +6719,12 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
return rc; return rc;
} }
DPRINTF("moving %s node %u [%s] on page %"Z"u to node %u on page %"Z"u", DPRINTF(("moving %s node %u [%s] on page %"Z"u to node %u on page %"Z"u",
IS_LEAF(csrc->mc_pg[csrc->mc_top]) ? "leaf" : "branch", IS_LEAF(csrc->mc_pg[csrc->mc_top]) ? "leaf" : "branch",
csrc->mc_ki[csrc->mc_top], csrc->mc_ki[csrc->mc_top],
DKEY(&key), DKEY(&key),
csrc->mc_pg[csrc->mc_top]->mp_pgno, csrc->mc_pg[csrc->mc_top]->mp_pgno,
cdst->mc_ki[cdst->mc_top], cdst->mc_pg[cdst->mc_top]->mp_pgno); cdst->mc_ki[cdst->mc_top], cdst->mc_pg[cdst->mc_top]->mp_pgno));
/* Add the node to the destination page. /* Add the node to the destination page.
*/ */
@ -6774,8 +6770,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
key.mv_size = NODEKSZ(srcnode); key.mv_size = NODEKSZ(srcnode);
key.mv_data = NODEKEY(srcnode); key.mv_data = NODEKEY(srcnode);
} }
DPRINTF("update separator for source page %"Z"u to [%s]", DPRINTF(("update separator for source page %"Z"u to [%s]",
csrc->mc_pg[csrc->mc_top]->mp_pgno, DKEY(&key)); csrc->mc_pg[csrc->mc_top]->mp_pgno, DKEY(&key)));
mdb_cursor_copy(csrc, &mn); mdb_cursor_copy(csrc, &mn);
mn.mc_snum--; mn.mc_snum--;
mn.mc_top--; mn.mc_top--;
@ -6802,8 +6798,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
key.mv_size = NODEKSZ(srcnode); key.mv_size = NODEKSZ(srcnode);
key.mv_data = NODEKEY(srcnode); key.mv_data = NODEKEY(srcnode);
} }
DPRINTF("update separator for destination page %"Z"u to [%s]", DPRINTF(("update separator for destination page %"Z"u to [%s]",
cdst->mc_pg[cdst->mc_top]->mp_pgno, DKEY(&key)); cdst->mc_pg[cdst->mc_top]->mp_pgno, DKEY(&key)));
mdb_cursor_copy(cdst, &mn); mdb_cursor_copy(cdst, &mn);
mn.mc_snum--; mn.mc_snum--;
mn.mc_top--; mn.mc_top--;
@ -6840,8 +6836,8 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
MDB_val key, data; MDB_val key, data;
unsigned nkeys; unsigned nkeys;
DPRINTF("merging page %"Z"u into %"Z"u", csrc->mc_pg[csrc->mc_top]->mp_pgno, DPRINTF(("merging page %"Z"u into %"Z"u", csrc->mc_pg[csrc->mc_top]->mp_pgno,
cdst->mc_pg[cdst->mc_top]->mp_pgno); cdst->mc_pg[cdst->mc_top]->mp_pgno));
assert(csrc->mc_snum > 1); /* can't merge root page */ assert(csrc->mc_snum > 1); /* can't merge root page */
assert(cdst->mc_snum > 1); assert(cdst->mc_snum > 1);
@ -6893,8 +6889,9 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
} }
} }
DPRINTF("dst page %"Z"u now has %u keys (%.1f%% filled)", DPRINTF(("dst page %"Z"u now has %u keys (%.1f%% filled)",
cdst->mc_pg[cdst->mc_top]->mp_pgno, NUMKEYS(cdst->mc_pg[cdst->mc_top]), (float)PAGEFILL(cdst->mc_txn->mt_env, cdst->mc_pg[cdst->mc_top]) / 10); cdst->mc_pg[cdst->mc_top]->mp_pgno, NUMKEYS(cdst->mc_pg[cdst->mc_top]),
(float)PAGEFILL(cdst->mc_txn->mt_env, cdst->mc_pg[cdst->mc_top]) / 10));
/* Unlink the src page from parent and add to free list. /* Unlink the src page from parent and add to free list.
*/ */
@ -6984,9 +6981,10 @@ mdb_rebalance(MDB_cursor *mc)
{ {
pgno_t pgno; pgno_t pgno;
COPY_PGNO(pgno, mc->mc_pg[mc->mc_top]->mp_pgno); COPY_PGNO(pgno, mc->mc_pg[mc->mc_top]->mp_pgno);
DPRINTF("rebalancing %s page %"Z"u (has %u keys, %.1f%% full)", DPRINTF(("rebalancing %s page %"Z"u (has %u keys, %.1f%% full)",
IS_LEAF(mc->mc_pg[mc->mc_top]) ? "leaf" : "branch", IS_LEAF(mc->mc_pg[mc->mc_top]) ? "leaf" : "branch",
pgno, NUMKEYS(mc->mc_pg[mc->mc_top]), (float)PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) / 10); pgno, NUMKEYS(mc->mc_pg[mc->mc_top]),
(float)PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) / 10));
} }
#endif #endif
@ -6995,8 +6993,8 @@ mdb_rebalance(MDB_cursor *mc)
#if MDB_DEBUG #if MDB_DEBUG
pgno_t pgno; pgno_t pgno;
COPY_PGNO(pgno, mc->mc_pg[mc->mc_top]->mp_pgno); COPY_PGNO(pgno, mc->mc_pg[mc->mc_top]->mp_pgno);
DPRINTF("no need to rebalance page %"Z"u, above fill threshold", DPRINTF(("no need to rebalance page %"Z"u, above fill threshold",
pgno); pgno));
#endif #endif
return MDB_SUCCESS; return MDB_SUCCESS;
} }
@ -7116,8 +7114,9 @@ mdb_rebalance(MDB_cursor *mc)
mc->mc_ki[mc->mc_top] = 0; mc->mc_ki[mc->mc_top] = 0;
} }
DPRINTF("found neighbor page %"Z"u (%u keys, %.1f%% full)", DPRINTF(("found neighbor page %"Z"u (%u keys, %.1f%% full)",
mn.mc_pg[mn.mc_top]->mp_pgno, NUMKEYS(mn.mc_pg[mn.mc_top]), (float)PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) / 10); mn.mc_pg[mn.mc_top]->mp_pgno, NUMKEYS(mn.mc_pg[mn.mc_top]),
(float)PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) / 10));
/* If the neighbor page is above threshold and has enough keys, /* If the neighbor page is above threshold and has enough keys,
* move one key from it. Otherwise we should try to merge them. * move one key from it. Otherwise we should try to merge them.
@ -7204,7 +7203,7 @@ mdb_del(MDB_txn *txn, MDB_dbi dbi,
assert(key != NULL); assert(key != NULL);
DPRINTF("====> delete db %u key [%s]", dbi, DKEY(key)); DPRINTF(("====> delete db %u key [%s]", dbi, DKEY(key)));
if (txn == NULL || !dbi || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID)) if (txn == NULL || !dbi || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID))
return EINVAL; return EINVAL;
@ -7280,14 +7279,14 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
newindx = mc->mc_ki[mc->mc_top]; newindx = mc->mc_ki[mc->mc_top];
DPRINTF("-----> splitting %s page %"Z"u and adding [%s] at index %i", DPRINTF(("-----> splitting %s page %"Z"u and adding [%s] at index %i",
IS_LEAF(mp) ? "leaf" : "branch", mp->mp_pgno, IS_LEAF(mp) ? "leaf" : "branch", mp->mp_pgno,
DKEY(newkey), mc->mc_ki[mc->mc_top]); DKEY(newkey), mc->mc_ki[mc->mc_top]));
/* Create a right sibling. */ /* Create a right sibling. */
if ((rc = mdb_page_new(mc, mp->mp_flags, 1, &rp))) if ((rc = mdb_page_new(mc, mp->mp_flags, 1, &rp)))
return rc; return rc;
DPRINTF("new right sibling: page %"Z"u", rp->mp_pgno); DPRINTF(("new right sibling: page %"Z"u", rp->mp_pgno));
if (mc->mc_snum < 2) { if (mc->mc_snum < 2) {
if ((rc = mdb_page_new(mc, P_BRANCH, 1, &pp))) if ((rc = mdb_page_new(mc, P_BRANCH, 1, &pp)))
@ -7298,7 +7297,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
mc->mc_pg[0] = pp; mc->mc_pg[0] = pp;
mc->mc_ki[0] = 0; mc->mc_ki[0] = 0;
mc->mc_db->md_root = pp->mp_pgno; mc->mc_db->md_root = pp->mp_pgno;
DPRINTF("root split! new root = %"Z"u", pp->mp_pgno); DPRINTF(("root split! new root = %"Z"u", pp->mp_pgno));
mc->mc_db->md_depth++; mc->mc_db->md_depth++;
new_root = 1; new_root = 1;
@ -7316,7 +7315,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
ptop = 0; ptop = 0;
} else { } else {
ptop = mc->mc_top-1; ptop = mc->mc_top-1;
DPRINTF("parent branch page is %"Z"u", mc->mc_pg[ptop]->mp_pgno); DPRINTF(("parent branch page is %"Z"u", mc->mc_pg[ptop]->mp_pgno));
} }
mc->mc_flags |= C_SPLITTING; mc->mc_flags |= C_SPLITTING;
@ -7459,7 +7458,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
} }
newsep: newsep:
DPRINTF("separator is [%s]", DKEY(&sepkey)); DPRINTF(("separator is [%s]", DKEY(&sepkey)));
/* Copy separator key to the parent. /* Copy separator key to the parent.
*/ */