Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #571 

b773e66 MDB_VL32 - resync with master (Howard Chu)
This commit is contained in:
Riccardo Spagni 2015-12-30 09:38:01 +02:00
parent aa6dd048d8 b773e66877
commit 0db5ca7a49
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/db_drivers/liblmdb/lmdb.h vendored
View File

@ -176,7 +176,7 @@ typedef mode_t mdb_mode_t;
#ifdef MDB_VL32 #ifdef MDB_VL32
typedef uint64_t mdb_size_t; typedef uint64_t mdb_size_t;
#define mdb_env_create(env) mdb_env_create_vl32(env) /**< Prevent mixing with non-VL32 builds */ #define mdb_env_create mdb_env_create_vl32 /**< Prevent mixing with non-VL32 builds */
#else #else
typedef size_t mdb_size_t; typedef size_t mdb_size_t;
#endif #endif

148
external/db_drivers/liblmdb/mdb.c vendored
View File

@ -455,15 +455,14 @@ typedef pthread_mutex_t mdb_mutex_t[1], *mdb_mutexref_t;
#define GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE)) #define GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE))
#endif #endif
#ifndef MDB_VL32 #ifdef MDB_VL32
#define Yd Z"d" #ifdef _WIN32
#define Yu Z"u" #define Y "I64"
#elif defined _WIN32
#define Yd "I64d"
#define Yu "I64u"
#else #else
#define Yd PRId64 #define Y "ll"
#define Yu PRIu64 #endif
#else
#define Y Z
#endif #endif
#if defined(_WIN32) || defined(MDB_USE_POSIX_SEM) #if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
@ -1706,20 +1705,20 @@ mdb_page_list(MDB_page *mp)
case P_LEAF|P_LEAF2: type = "LEAF2 page"; break; case P_LEAF|P_LEAF2: type = "LEAF2 page"; break;
case P_LEAF|P_LEAF2|P_SUBP: type = "LEAF2 sub-page"; break; case P_LEAF|P_LEAF2|P_SUBP: type = "LEAF2 sub-page"; break;
case P_OVERFLOW: case P_OVERFLOW:
fprintf(stderr, "Overflow page %"Yu" pages %u%s\n", fprintf(stderr, "Overflow page %"Y"u pages %u%s\n",
pgno, mp->mp_pages, state); pgno, mp->mp_pages, state);
return; return;
case P_META: case P_META:
fprintf(stderr, "Meta-page %"Yu" txnid %"Yu"\n", fprintf(stderr, "Meta-page %"Y"u txnid %"Y"u\n",
pgno, ((MDB_meta *)METADATA(mp))->mm_txnid); pgno, ((MDB_meta *)METADATA(mp))->mm_txnid);
return; return;
default: default:
fprintf(stderr, "Bad page %"Yu" flags 0x%u\n", pgno, mp->mp_flags); fprintf(stderr, "Bad page %"Y"u flags 0x%u\n", pgno, mp->mp_flags);
return; return;
} }
nkeys = NUMKEYS(mp); nkeys = NUMKEYS(mp);
fprintf(stderr, "%s %"Yu" numkeys %d%s\n", type, pgno, nkeys, state); fprintf(stderr, "%s %"Y"u numkeys %d%s\n", type, pgno, nkeys, state);
for (i=0; i<nkeys; i++) { for (i=0; i<nkeys; i++) {
if (IS_LEAF2(mp)) { /* LEAF2 pages have no mp_ptrs[] or node headers */ if (IS_LEAF2(mp)) { /* LEAF2 pages have no mp_ptrs[] or node headers */
@ -1734,7 +1733,7 @@ mdb_page_list(MDB_page *mp)
key.mv_data = node->mn_data; key.mv_data = node->mn_data;
nsize = NODESIZE + key.mv_size; nsize = NODESIZE + key.mv_size;
if (IS_BRANCH(mp)) { if (IS_BRANCH(mp)) {
fprintf(stderr, "key %d: page %"Yu", %s\n", i, NODEPGNO(node), fprintf(stderr, "key %d: page %"Y"u, %s\n", i, NODEPGNO(node),
DKEY(&key)); DKEY(&key));
total += nsize; total += nsize;
} else { } else {
@ -1830,7 +1829,7 @@ static void mdb_audit(MDB_txn *txn)
} }
} }
if (freecount + count + NUM_METAS != txn->mt_next_pgno) { if (freecount + count + NUM_METAS != txn->mt_next_pgno) {
fprintf(stderr, "audit: %"Yu" freecount: %"Yu" count: %"Yu" total: %"Yu" next_pgno: %"Yu"\n", fprintf(stderr, "audit: %"Y"u freecount: %"Y"u count: %"Y"u total: %"Y"u next_pgno: %"Y"u\n",
txn->mt_txnid, freecount, count+NUM_METAS, txn->mt_txnid, freecount, count+NUM_METAS,
freecount+count+NUM_METAS, txn->mt_next_pgno); freecount+count+NUM_METAS, txn->mt_next_pgno);
} }
@ -1953,7 +1952,7 @@ static void
mdb_cursor_unref(MDB_cursor *mc) mdb_cursor_unref(MDB_cursor *mc)
{ {
int i; int i;
if (!mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0])) if (!mc->mc_snum || !mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0]))
return; return;
for (i=0; i<mc->mc_snum; i++) for (i=0; i<mc->mc_snum; i++)
mdb_page_unref(mc->mc_txn, mc->mc_pg[i]); mdb_page_unref(mc->mc_txn, mc->mc_pg[i]);
@ -2010,7 +2009,7 @@ mdb_page_loose(MDB_cursor *mc, MDB_page *mp)
} }
} }
if (loose) { if (loose) {
DPRINTF(("loosen db %d page %"Yu"", DDBI(mc), DPRINTF(("loosen db %d page %"Y"u", DDBI(mc),
mp->mp_pgno)); mp->mp_pgno));
NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs; NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs;
txn->mt_loose_pgs = mp; txn->mt_loose_pgs = mp;
@ -2308,7 +2307,7 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
np = txn->mt_loose_pgs; np = txn->mt_loose_pgs;
txn->mt_loose_pgs = NEXT_LOOSE_PAGE(np); txn->mt_loose_pgs = NEXT_LOOSE_PAGE(np);
txn->mt_loose_count--; txn->mt_loose_count--;
DPRINTF(("db %d use loose page %"Yu"", DDBI(mc), DPRINTF(("db %d use loose page %"Y"u", DDBI(mc),
np->mp_pgno)); np->mp_pgno));
*mp = np; *mp = np;
return MDB_SUCCESS; return MDB_SUCCESS;
@ -2411,10 +2410,10 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
} }
env->me_pglast = last; env->me_pglast = last;
#if (MDB_DEBUG) > 1 #if (MDB_DEBUG) > 1
DPRINTF(("IDL read txn %"Yu" root %"Yu" num %u", DPRINTF(("IDL read txn %"Y"u root %"Y"u num %u",
last, txn->mt_dbs[FREE_DBI].md_root, i)); last, txn->mt_dbs[FREE_DBI].md_root, i));
for (j = i; j; j--) for (j = i; j; j--)
DPRINTF(("IDL %"Yu"", idl[j])); DPRINTF(("IDL %"Y"u", idl[j]));
#endif #endif
/* Merge in descending sorted order */ /* Merge in descending sorted order */
mdb_midl_xmerge(mop, idl); mdb_midl_xmerge(mop, idl);
@ -2584,7 +2583,7 @@ mdb_page_touch(MDB_cursor *mc)
(rc = mdb_page_alloc(mc, 1, &np))) (rc = mdb_page_alloc(mc, 1, &np)))
goto fail; goto fail;
pgno = np->mp_pgno; pgno = np->mp_pgno;
DPRINTF(("touched db %d page %"Yu" -> %"Yu"", DDBI(mc), DPRINTF(("touched db %d page %"Y"u -> %"Y"u", DDBI(mc),
mp->mp_pgno, pgno)); mp->mp_pgno, pgno));
mdb_cassert(mc, mp->mp_pgno != pgno); mdb_cassert(mc, mp->mp_pgno != pgno);
mdb_midl_xappend(txn->mt_free_pgs, mp->mp_pgno); mdb_midl_xappend(txn->mt_free_pgs, mp->mp_pgno);
@ -2985,7 +2984,7 @@ 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 %"Yu"%c %p on mdbenv %p, root page %"Yu"", DPRINTF(("renew txn %"Y"u%c %p on mdbenv %p, root page %"Y"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));
} }
@ -3103,7 +3102,7 @@ renew:
} else { } else {
txn->mt_flags |= flags; /* could not change txn=me_txn0 earlier */ txn->mt_flags |= flags; /* could not change txn=me_txn0 earlier */
*ret = txn; *ret = txn;
DPRINTF(("begin txn %"Yu"%c %p on mdbenv %p, root page %"Yu"", DPRINTF(("begin txn %"Y"u%c %p on mdbenv %p, root page %"Y"u",
txn->mt_txnid, (flags & MDB_RDONLY) ? 'r' : 'w', txn->mt_txnid, (flags & MDB_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));
} }
@ -3170,7 +3169,7 @@ mdb_txn_end(MDB_txn *txn, unsigned mode)
/* Export or close DBI handles opened in this txn */ /* Export or close DBI handles opened in this txn */
mdb_dbis_update(txn, mode & MDB_END_UPDATE); mdb_dbis_update(txn, mode & MDB_END_UPDATE);
DPRINTF(("%s txn %"Yu"%c %p on mdbenv %p, root page %"Yu"", DPRINTF(("%s txn %"Y"u%c %p on mdbenv %p, root page %"Y"u",
names[mode & MDB_END_OPMASK], names[mode & MDB_END_OPMASK],
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));
@ -3371,10 +3370,10 @@ mdb_freelist_save(MDB_txn *txn)
#if (MDB_DEBUG) > 1 #if (MDB_DEBUG) > 1
{ {
unsigned int i = free_pgs[0]; unsigned int i = free_pgs[0];
DPRINTF(("IDL write txn %"Yu" root %"Yu" num %u", DPRINTF(("IDL write txn %"Y"u root %"Y"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 %"Yu"", free_pgs[i])); DPRINTF(("IDL %"Y"u", free_pgs[i]));
} }
#endif #endif
continue; continue;
@ -3593,7 +3592,7 @@ retry_seek:
wpos = pos; wpos = pos;
wsize = 0; wsize = 0;
} }
DPRINTF(("committing page %"Yu"", pgno)); DPRINTF(("committing page %"Y"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;
@ -3806,7 +3805,7 @@ 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 %"Yu" %p on mdbenv %p, root page %"Yu"", DPRINTF(("committing txn %"Y"u %p on mdbenv %p, root page %"Y"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 */
@ -3904,7 +3903,7 @@ mdb_env_read_header(MDB_env *env, MDB_meta *meta)
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 %"Yu" not a meta page", p->mp_pgno)); DPRINTF(("page %"Y"u not a meta page", p->mp_pgno));
return MDB_INVALID; return MDB_INVALID;
} }
@ -4016,7 +4015,7 @@ mdb_env_write_meta(MDB_txn *txn)
#endif #endif
toggle = txn->mt_txnid & 1; toggle = txn->mt_txnid & 1;
DPRINTF(("writing meta page %d for root page %"Yu"", DPRINTF(("writing meta page %d for root page %"Y"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;
@ -4499,11 +4498,11 @@ mdb_env_open2(MDB_env *env)
meta->mm_version, env->me_psize)); meta->mm_version, env->me_psize));
DPRINTF(("using meta page %d", (int) (meta->mm_txnid & 1))); DPRINTF(("using meta page %d", (int) (meta->mm_txnid & 1)));
DPRINTF(("depth: %u", db->md_depth)); DPRINTF(("depth: %u", db->md_depth));
DPRINTF(("entries: %"Yu"", db->md_entries)); DPRINTF(("entries: %"Y"u", db->md_entries));
DPRINTF(("branch pages: %"Yu"", db->md_branch_pages)); DPRINTF(("branch pages: %"Y"u", db->md_branch_pages));
DPRINTF(("leaf pages: %"Yu"", db->md_leaf_pages)); DPRINTF(("leaf pages: %"Y"u", db->md_leaf_pages));
DPRINTF(("overflow pages: %"Yu"", db->md_overflow_pages)); DPRINTF(("overflow pages: %"Y"u", db->md_overflow_pages));
DPRINTF(("root: %"Yu"", db->md_root)); DPRINTF(("root: %"Y"u", db->md_root));
} }
#endif #endif
@ -5351,6 +5350,7 @@ mdb_env_close0(MDB_env *env, int excl)
} }
#ifdef MDB_VL32 #ifdef MDB_VL32
#ifdef _WIN32 #ifdef _WIN32
if (env->me_fmh) CloseHandle(env->me_fmh);
if (env->me_rpmutex) CloseHandle(env->me_rpmutex); if (env->me_rpmutex) CloseHandle(env->me_rpmutex);
#else #else
pthread_mutex_destroy(&env->me_rpmutex); pthread_mutex_destroy(&env->me_rpmutex);
@ -5495,7 +5495,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
nkeys = NUMKEYS(mp); nkeys = NUMKEYS(mp);
DPRINTF(("searching %u keys in %s %spage %"Yu"", DPRINTF(("searching %u keys in %s %spage %"Y"u",
nkeys, IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "", nkeys, IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "",
mdb_dbg_pgno(mp))); mdb_dbg_pgno(mp)));
@ -5543,7 +5543,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
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 -> %"Yu"], rc = %i", DPRINTF(("found branch index %u [%s -> %"Y"u], rc = %i",
i, DKEY(&nodekey), NODEPGNO(node), rc)); i, DKEY(&nodekey), NODEPGNO(node), rc));
#endif #endif
if (rc == 0) if (rc == 0)
@ -5591,7 +5591,7 @@ static void
mdb_cursor_pop(MDB_cursor *mc) mdb_cursor_pop(MDB_cursor *mc)
{ {
if (mc->mc_snum) { if (mc->mc_snum) {
DPRINTF(("popping page %"Yu" off db %d cursor %p", DPRINTF(("popping page %"Y"u off db %d cursor %p",
mc->mc_pg[mc->mc_top]->mp_pgno, DDBI(mc), (void *) mc)); mc->mc_pg[mc->mc_top]->mp_pgno, DDBI(mc), (void *) mc));
mc->mc_snum--; mc->mc_snum--;
@ -5607,7 +5607,7 @@ 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 %"Yu" on db %d cursor %p", mp->mp_pgno, DPRINTF(("pushing page %"Y"u on db %d cursor %p", mp->mp_pgno,
DDBI(mc), (void *) mc)); DDBI(mc), (void *) mc));
if (mc->mc_snum >= CURSOR_STACK) { if (mc->mc_snum >= CURSOR_STACK) {
@ -5995,7 +5995,7 @@ mdb_page_get(MDB_cursor *mc, pgno_t pgno, MDB_page **ret, int *lvl)
p = (MDB_page *)(env->me_map + env->me_psize * pgno); p = (MDB_page *)(env->me_map + env->me_psize * pgno);
#endif #endif
} else { } else {
DPRINTF(("page %"Yu" not found", pgno)); DPRINTF(("page %"Y"u not found", pgno));
txn->mt_flags |= MDB_TXN_ERROR; txn->mt_flags |= MDB_TXN_ERROR;
return MDB_PAGE_NOTFOUND; return MDB_PAGE_NOTFOUND;
} }
@ -6021,13 +6021,13 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int flags)
MDB_node *node; MDB_node *node;
indx_t i; indx_t i;
DPRINTF(("branch page %"Yu" has %u keys", mp->mp_pgno, NUMKEYS(mp))); DPRINTF(("branch page %"Y"u has %u keys", mp->mp_pgno, NUMKEYS(mp)));
/* Don't assert on branch pages in the FreeDB. We can get here /* Don't assert on branch pages in the FreeDB. We can get here
* while in the process of rebalancing a FreeDB branch page; we must * while in the process of rebalancing a FreeDB branch page; we must
* let that proceed. ITS#8336 * let that proceed. ITS#8336
*/ */
mdb_cassert(mc, !mc->mc_dbi || NUMKEYS(mp) > 1); mdb_cassert(mc, !mc->mc_dbi || NUMKEYS(mp) > 1);
DPRINTF(("found index 0 to page %"Yu"", NODEPGNO(NODEPTR(mp, 0)))); DPRINTF(("found index 0 to page %"Y"u", NODEPGNO(NODEPTR(mp, 0))));
if (flags & (MDB_PS_FIRST|MDB_PS_LAST)) { if (flags & (MDB_PS_FIRST|MDB_PS_LAST)) {
i = 0; i = 0;
@ -6072,7 +6072,7 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int flags)
return MDB_CORRUPTED; return MDB_CORRUPTED;
} }
DPRINTF(("found leaf page %"Yu" for key [%s]", mp->mp_pgno, DPRINTF(("found leaf page %"Y"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;
@ -6187,7 +6187,7 @@ 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 %d root page %"Yu" has flags 0x%X", DPRINTF(("db %d root page %"Y"u has flags 0x%X",
DDBI(mc), root, mc->mc_pg[0]->mp_flags)); DDBI(mc), root, mc->mc_pg[0]->mp_flags));
if (flags & MDB_PS_MODIFY) { if (flags & MDB_PS_MODIFY) {
@ -6212,7 +6212,7 @@ mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp)
MDB_ID pn = pg << 1; MDB_ID pn = pg << 1;
int rc; int rc;
DPRINTF(("free ov page %"Yu" (%d)", pg, ovpages)); DPRINTF(("free ov page %"Y"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.
@ -6307,7 +6307,7 @@ mdb_node_read(MDB_cursor *mc, 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(mc, pgno, &omp, NULL)) != 0) { if ((rc = mdb_page_get(mc, pgno, &omp, NULL)) != 0) {
DPRINTF(("read overflow page %"Yu" failed", pgno)); DPRINTF(("read overflow page %"Y"u failed", pgno));
return rc; return rc;
} }
data->mv_data = METADATA(omp); data->mv_data = METADATA(omp);
@ -6374,7 +6374,7 @@ mdb_cursor_sibling(MDB_cursor *mc, int move_right)
op = mc->mc_pg[mc->mc_top]; op = mc->mc_pg[mc->mc_top];
#endif #endif
mdb_cursor_pop(mc); mdb_cursor_pop(mc);
DPRINTF(("parent page is page %"Yu", index %u", DPRINTF(("parent page is page %"Y"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]))
@ -6454,7 +6454,7 @@ mdb_cursor_next(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
} }
} }
DPRINTF(("cursor_next: top page is %"Yu" in cursor %p", DPRINTF(("cursor_next: top page is %"Y"u in cursor %p",
mdb_dbg_pgno(mp), (void *) mc)); mdb_dbg_pgno(mp), (void *) mc));
if (mc->mc_flags & C_DEL) if (mc->mc_flags & C_DEL)
goto skip; goto skip;
@ -6466,12 +6466,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 %"Yu", key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top])); DPRINTF(("next page is %"Y"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]++;
skip: skip:
DPRINTF(("==> cursor points to page %"Yu" with %u keys, key index %u", DPRINTF(("==> cursor points to page %"Y"u with %u keys, key index %u",
mdb_dbg_pgno(mp), NUMKEYS(mp), mc->mc_ki[mc->mc_top])); mdb_dbg_pgno(mp), NUMKEYS(mp), mc->mc_ki[mc->mc_top]));
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
@ -6540,7 +6540,7 @@ mdb_cursor_prev(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
} }
} }
DPRINTF(("cursor_prev: top page is %"Yu" in cursor %p", DPRINTF(("cursor_prev: top page is %"Y"u in cursor %p",
mdb_dbg_pgno(mp), (void *) mc)); mdb_dbg_pgno(mp), (void *) mc));
if (mc->mc_ki[mc->mc_top] == 0) { if (mc->mc_ki[mc->mc_top] == 0) {
@ -6550,13 +6550,13 @@ 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 %"Yu", key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top])); DPRINTF(("prev page is %"Y"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 %"Yu" with %u keys, key index %u", DPRINTF(("==> cursor points to page %"Y"u with %u keys, key index %u",
mdb_dbg_pgno(mp), NUMKEYS(mp), mc->mc_ki[mc->mc_top])); mdb_dbg_pgno(mp), NUMKEYS(mp), mc->mc_ki[mc->mc_top]));
if (IS_LEAF2(mp)) { if (IS_LEAF2(mp)) {
@ -7749,7 +7749,7 @@ 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 %"Yu", page size %u", DPRINTF(("allocated new mpage %"Y"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-PAGEBASE); np->mp_lower = (PAGEHDRSZ-PAGEBASE);
@ -7849,7 +7849,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
mdb_cassert(mc, mp->mp_upper >= mp->mp_lower); mdb_cassert(mc, mp->mp_upper >= mp->mp_lower);
DPRINTF(("add to %s %spage %"Yu" index %i, data size %"Z"u key size %"Z"u [%s]", DPRINTF(("add to %s %spage %"Y"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-" : "",
mdb_dbg_pgno(mp), indx, data ? data->mv_size : 0, mdb_dbg_pgno(mp), indx, data ? data->mv_size : 0,
@ -7890,7 +7890,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
goto full; goto full;
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 %"Yu"", ofp->mp_pgno)); DPRINTF(("allocated overflow page %"Y"u", ofp->mp_pgno));
flags |= F_BIGDATA; flags |= F_BIGDATA;
goto update; goto update;
} else { } else {
@ -7947,7 +7947,7 @@ update:
return MDB_SUCCESS; return MDB_SUCCESS;
full: full:
DPRINTF(("not enough room in page %"Yu", got %u ptrs", DPRINTF(("not enough room in page %"Y"u, got %u ptrs",
mdb_dbg_pgno(mp), NUMKEYS(mp))); mdb_dbg_pgno(mp), NUMKEYS(mp)));
DPRINTF(("upper-lower = %u - %u = %"Z"d", mp->mp_upper,mp->mp_lower,room)); DPRINTF(("upper-lower = %u - %u = %"Z"d", mp->mp_upper,mp->mp_lower,room));
DPRINTF(("node size = %"Z"u", node_size)); DPRINTF(("node size = %"Z"u", node_size));
@ -7970,7 +7970,7 @@ mdb_node_del(MDB_cursor *mc, int ksize)
MDB_node *node; MDB_node *node;
char *base; char *base;
DPRINTF(("delete node %u on %s page %"Yu"", indx, DPRINTF(("delete node %u on %s page %"Y"u", indx,
IS_LEAF(mp) ? "leaf" : "branch", mdb_dbg_pgno(mp))); IS_LEAF(mp) ? "leaf" : "branch", mdb_dbg_pgno(mp)));
numkeys = NUMKEYS(mp); numkeys = NUMKEYS(mp);
mdb_cassert(mc, indx < numkeys); mdb_cassert(mc, indx < numkeys);
@ -8129,7 +8129,7 @@ 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 root page %"Yu"", mx->mx_cursor.mc_dbi, DPRINTF(("Sub-db -%u root page %"Y"u", mx->mx_cursor.mc_dbi,
mx->mx_db.md_root)); mx->mx_db.md_root));
mx->mx_dbflag = DB_VALID|DB_USRVALID|DB_DIRTY; /* DB_DIRTY guides mdb_cursor_touch */ mx->mx_dbflag = DB_VALID|DB_USRVALID|DB_DIRTY; /* DB_DIRTY guides mdb_cursor_touch */
#if UINT_MAX < SIZE_MAX || defined(MDB_VL32) #if UINT_MAX < SIZE_MAX || defined(MDB_VL32)
@ -8166,7 +8166,7 @@ mdb_xcursor_init2(MDB_cursor *mc, MDB_xcursor *src_mx, int new_dupdata)
} }
mx->mx_db = src_mx->mx_db; mx->mx_db = src_mx->mx_db;
mx->mx_cursor.mc_pg[0] = src_mx->mx_cursor.mc_pg[0]; mx->mx_cursor.mc_pg[0] = src_mx->mx_cursor.mc_pg[0];
DPRINTF(("Sub-db -%u root page %"Yu"", mx->mx_cursor.mc_dbi, DPRINTF(("Sub-db -%u root page %"Y"u", mx->mx_cursor.mc_dbi,
mx->mx_db.md_root)); mx->mx_db.md_root));
} }
@ -8338,7 +8338,7 @@ mdb_update_key(MDB_cursor *mc, MDB_val *key)
char kbuf2[DKBUF_MAXKEYSIZE*2+1]; char kbuf2[DKBUF_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 %"Yu"", DPRINTF(("update key %u (ofs %u) [%s] to [%s] on page %"Y"u",
indx, ptr, indx, ptr,
mdb_dkey(&k2, kbuf2), mdb_dkey(&k2, kbuf2),
DKEY(key), DKEY(key),
@ -8486,7 +8486,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
return rc; return rc;
} }
DPRINTF(("moving %s node %u [%s] on page %"Yu" to node %u on page %"Yu"", DPRINTF(("moving %s node %u [%s] on page %"Y"u to node %u on page %"Y"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),
@ -8580,7 +8580,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
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 %"Yu" to [%s]", DPRINTF(("update separator for source page %"Y"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--;
@ -8611,7 +8611,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
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 %"Yu" to [%s]", DPRINTF(("update separator for destination page %"Y"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--;
@ -8657,7 +8657,7 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
psrc = csrc->mc_pg[csrc->mc_top]; psrc = csrc->mc_pg[csrc->mc_top];
pdst = cdst->mc_pg[cdst->mc_top]; pdst = cdst->mc_pg[cdst->mc_top];
DPRINTF(("merging page %"Yu" into %"Yu"", psrc->mp_pgno, pdst->mp_pgno)); DPRINTF(("merging page %"Y"u into %"Y"u", psrc->mp_pgno, pdst->mp_pgno));
mdb_cassert(csrc, csrc->mc_snum > 1); /* can't merge root page */ mdb_cassert(csrc, csrc->mc_snum > 1); /* can't merge root page */
mdb_cassert(csrc, cdst->mc_snum > 1); mdb_cassert(csrc, cdst->mc_snum > 1);
@ -8714,7 +8714,7 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
} }
} }
DPRINTF(("dst page %"Yu" now has %u keys (%.1f%% filled)", DPRINTF(("dst page %"Y"u now has %u keys (%.1f%% filled)",
pdst->mp_pgno, NUMKEYS(pdst), pdst->mp_pgno, NUMKEYS(pdst),
(float)PAGEFILL(cdst->mc_txn->mt_env, pdst) / 10)); (float)PAGEFILL(cdst->mc_txn->mt_env, pdst) / 10));
@ -8833,14 +8833,14 @@ mdb_rebalance(MDB_cursor *mc)
minkeys = 1; minkeys = 1;
thresh = FILL_THRESHOLD; thresh = FILL_THRESHOLD;
} }
DPRINTF(("rebalancing %s page %"Yu" (has %u keys, %.1f%% full)", DPRINTF(("rebalancing %s page %"Y"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",
mdb_dbg_pgno(mc->mc_pg[mc->mc_top]), NUMKEYS(mc->mc_pg[mc->mc_top]), mdb_dbg_pgno(mc->mc_pg[mc->mc_top]), NUMKEYS(mc->mc_pg[mc->mc_top]),
(float)PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) / 10)); (float)PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) / 10));
if (PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) >= thresh && if (PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) >= thresh &&
NUMKEYS(mc->mc_pg[mc->mc_top]) >= minkeys) { NUMKEYS(mc->mc_pg[mc->mc_top]) >= minkeys) {
DPRINTF(("no need to rebalance page %"Yu", above fill threshold", DPRINTF(("no need to rebalance page %"Y"u, above fill threshold",
mdb_dbg_pgno(mc->mc_pg[mc->mc_top]))); mdb_dbg_pgno(mc->mc_pg[mc->mc_top])));
return MDB_SUCCESS; return MDB_SUCCESS;
} }
@ -8969,7 +8969,7 @@ mdb_rebalance(MDB_cursor *mc)
fromleft = 1; fromleft = 1;
} }
DPRINTF(("found neighbor page %"Yu" (%u keys, %.1f%% full)", DPRINTF(("found neighbor page %"Y"u (%u keys, %.1f%% full)",
mn.mc_pg[mn.mc_top]->mp_pgno, NUMKEYS(mn.mc_pg[mn.mc_top]), 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)); (float)PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) / 10));
@ -9171,7 +9171,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
newindx = mc->mc_ki[mc->mc_top]; newindx = mc->mc_ki[mc->mc_top];
nkeys = NUMKEYS(mp); nkeys = NUMKEYS(mp);
DPRINTF(("-----> splitting %s page %"Yu" and adding [%s] at index %i/%i", DPRINTF(("-----> splitting %s page %"Y"u and adding [%s] at index %i/%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], nkeys)); DKEY(newkey), mc->mc_ki[mc->mc_top], nkeys));
@ -9179,7 +9179,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
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;
rp->mp_pad = mp->mp_pad; rp->mp_pad = mp->mp_pad;
DPRINTF(("new right sibling: page %"Yu"", rp->mp_pgno)); DPRINTF(("new right sibling: page %"Y"u", rp->mp_pgno));
/* Usually when splitting the root page, the cursor /* Usually when splitting the root page, the cursor
* height is 1. But when called from mdb_update_key, * height is 1. But when called from mdb_update_key,
@ -9197,7 +9197,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 = %"Yu"", pp->mp_pgno)); DPRINTF(("root split! new root = %"Y"u", pp->mp_pgno));
new_root = mc->mc_db->md_depth++; new_root = mc->mc_db->md_depth++;
/* Add left (implicit) pointer. */ /* Add left (implicit) pointer. */
@ -9214,7 +9214,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 %"Yu"", mc->mc_pg[ptop]->mp_pgno)); DPRINTF(("parent branch page is %"Y"u", mc->mc_pg[ptop]->mp_pgno));
} }
mdb_cursor_copy(mc, &mn); mdb_cursor_copy(mc, &mn);
@ -10669,7 +10669,7 @@ mdb_reader_list(MDB_env *env, MDB_msg_func *func, void *ctx)
if (mr[i].mr_pid) { if (mr[i].mr_pid) {
txnid_t txnid = mr[i].mr_txnid; txnid_t txnid = mr[i].mr_txnid;
sprintf(buf, txnid == (txnid_t)-1 ? sprintf(buf, txnid == (txnid_t)-1 ?
"%10d %"Z"x -\n" : "%10d %"Z"x %"Yu"\n", "%10d %"Z"x -\n" : "%10d %"Z"x %"Y"u\n",
(int)mr[i].mr_pid, (size_t)mr[i].mr_tid, txnid); (int)mr[i].mr_pid, (size_t)mr[i].mr_tid, txnid);
if (first) { if (first) {
first = 0; first = 0;
@ -10774,7 +10774,7 @@ mdb_reader_check0(MDB_env *env, int rlocked, int *dead)
} }
for (; j<rdrs; j++) for (; j<rdrs; j++)
if (mr[j].mr_pid == pid) { if (mr[j].mr_pid == pid) {
DPRINTF(("clear stale reader pid %u txn %"Yd, DPRINTF(("clear stale reader pid %u txn %"Y"d",
(unsigned) pid, mr[j].mr_txnid)); (unsigned) pid, mr[j].mr_txnid));
mr[j].mr_pid = 0; mr[j].mr_pid = 0;
count++; count++;