MDB_VL32 preparation

Use 64 bit types consistently. This keeps database structures the
same size for MDB_VL32 and native 64 bit builds.

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index e481b34f05efd01e20c598e85d8f482550c8f587..d2bf5950583d35a9d73453bb04187c95b787f4d9 100644 (file)
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -161,6 +161,7 @@
 #define _LMDB_H_
 
 #include <sys/types.h>
+#include <inttypes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -173,6 +174,12 @@ typedef    int     mdb_mode_t;
 typedef        mode_t  mdb_mode_t;
 #endif
 
+#ifdef MDB_VL32
+typedef uint64_t       mdb_size_t;
+#else
+typedef size_t mdb_size_t;
+#endif
+
 /** An abstraction for a file handle.
  *     On POSIX systems file handles are small integers. On Windows
  *     they're opaque pointers.
@@ -450,18 +457,18 @@ typedef struct MDB_stat {
        unsigned int    ms_psize;                       /**< Size of a database page.
                                                                                        This is currently the same for all databases. */
        unsigned int    ms_depth;                       /**< Depth (height) of the B-tree */
-       size_t          ms_branch_pages;        /**< Number of internal (non-leaf) pages */
-       size_t          ms_leaf_pages;          /**< Number of leaf pages */
-       size_t          ms_overflow_pages;      /**< Number of overflow pages */
-       size_t          ms_entries;                     /**< Number of data items */
+       mdb_size_t              ms_branch_pages;        /**< Number of internal (non-leaf) pages */
+       mdb_size_t              ms_leaf_pages;          /**< Number of leaf pages */
+       mdb_size_t              ms_overflow_pages;      /**< Number of overflow pages */
+       mdb_size_t              ms_entries;                     /**< Number of data items */
 } MDB_stat;
 
 /** @brief Information about the environment */
 typedef struct MDB_envinfo {
        void    *me_mapaddr;                    /**< Address of map, if fixed */
-       size_t  me_mapsize;                             /**< Size of the data memory map */
-       size_t  me_last_pgno;                   /**< ID of the last used page */
-       size_t  me_last_txnid;                  /**< ID of the last committed transaction */
+       mdb_size_t      me_mapsize;                             /**< Size of the data memory map */
+       mdb_size_t      me_last_pgno;                   /**< ID of the last used page */
+       mdb_size_t      me_last_txnid;                  /**< ID of the last committed transaction */
        unsigned int me_maxreaders;             /**< max reader slots in the environment */
        unsigned int me_numreaders;             /**< max reader slots used in the environment */
 } MDB_envinfo;
@@ -828,7 +835,7 @@ int  mdb_env_get_fd(MDB_env *env, mdb_filehandle_t *fd);
         *      an active write transaction.
         * </ul>
         */
-int  mdb_env_set_mapsize(MDB_env *env, size_t size);
+int  mdb_env_set_mapsize(MDB_env *env, mdb_size_t size);
 
        /** @brief Set the maximum number of threads/reader slots for the environment.
         *
@@ -977,7 +984,7 @@ MDB_env *mdb_txn_env(MDB_txn *txn);
         * @param[in] txn A transaction handle returned by #mdb_txn_begin()
         * @return A transaction ID, valid if input is an active transaction.
         */
-size_t mdb_txn_id(MDB_txn *txn);
+mdb_size_t mdb_txn_id(MDB_txn *txn);
 
        /** @brief Commit all the operations of a transaction into the database.
         *

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 57c6a989c679e346910e9130204fc7764570c237..0e190e9d13680a5cbee919e392330e42f24a39d3 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -35,6 +35,9 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
+#ifdef MDB_VL32
+#define _FILE_OFFSET_BITS      64
+#endif
 #ifdef _WIN32
 #include <malloc.h>
 #include <windows.h>
@@ -240,7 +243,7 @@ union semun {
 #define ESECT
 #endif
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define CALL_CONV WINAPI
 #else
 #define CALL_CONV
@@ -452,6 +455,16 @@ typedef pthread_mutex_t mdb_mutex_t[1], *mdb_mutexref_t;
 #define        GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE))
 #endif
 
+#ifdef MDB_VL32
+#ifdef _WIN32
+#define        Y       "I64"
+#else
+#define        Y       "ll"
+#endif
+#else
+#define Y      Z
+#endif
+
 #if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
 #define MNAME_LEN      32
 #elif defined(MDB_USE_SYSV_SEM)
@@ -1062,7 +1075,7 @@ typedef struct MDB_db {
        pgno_t          md_branch_pages;        /**< number of internal pages */
        pgno_t          md_leaf_pages;          /**< number of leaf pages */
        pgno_t          md_overflow_pages;      /**< number of overflow pages */
-       size_t          md_entries;             /**< number of data items */
+       pgno_t          md_entries;             /**< number of data items */
        pgno_t          md_root;                /**< the root page of this tree */
 } MDB_db;
 
@@ -1092,8 +1105,16 @@ typedef struct MDB_meta {
        uint32_t        mm_magic;
                /** Version number of this file. Must be set to #MDB_DATA_VERSION. */
        uint32_t        mm_version;
+#ifdef MDB_VL32
+       union {         /* always zero since we don't support fixed mapping in MDB_VL32 */
+               MDB_ID  mmun_ull;
+               void *mmun_address;
+       } mm_un;
+#define        mm_address mm_un.mmun_address
+#else
        void            *mm_address;            /**< address for fixed mapping */
-       size_t          mm_mapsize;                     /**< size of mmap region */
+#endif
+       pgno_t          mm_mapsize;                     /**< size of mmap region */
        MDB_db          mm_dbs[CORE_DBS];       /**< first is free space, 2nd is main db */
        /** The size of pages used in this DB */
 #define        mm_psize        mm_dbs[FREE_DBI].md_pad
@@ -1318,7 +1339,7 @@ struct MDB_env {
        void            *me_pbuf;               /**< scratch area for DUPSORT put() */
        MDB_txn         *me_txn;                /**< current write transaction */
        MDB_txn         *me_txn0;               /**< prealloc'd write transaction */
-       size_t          me_mapsize;             /**< size of the data memory map */
+       mdb_size_t      me_mapsize;             /**< size of the data memory map */
        off_t           me_size;                /**< current file size */
        pgno_t          me_maxpg;               /**< me_mapsize / me_psize */
        MDB_dbx         *me_dbxs;               /**< array of static DB info */
@@ -1649,20 +1670,20 @@ mdb_page_list(MDB_page *mp)
        case P_LEAF|P_LEAF2:        type = "LEAF2 page";                break;
        case P_LEAF|P_LEAF2|P_SUBP: type = "LEAF2 sub-page";    break;
        case P_OVERFLOW:
-               fprintf(stderr, "Overflow page %"Z"u pages %u%s\n",
+               fprintf(stderr, "Overflow page %"Y"u pages %u%s\n",
                        pgno, mp->mp_pages, state);
                return;
        case P_META:
-               fprintf(stderr, "Meta-page %"Z"u txnid %"Z"u\n",
+               fprintf(stderr, "Meta-page %"Y"u txnid %"Y"u\n",
                        pgno, ((MDB_meta *)METADATA(mp))->mm_txnid);
                return;
        default:
-               fprintf(stderr, "Bad page %"Z"u flags 0x%u\n", pgno, mp->mp_flags);
+               fprintf(stderr, "Bad page %"Y"u flags 0x%u\n", pgno, mp->mp_flags);
                return;
        }
 
        nkeys = NUMKEYS(mp);
-       fprintf(stderr, "%s %"Z"u 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++) {
                if (IS_LEAF2(mp)) {     /* LEAF2 pages have no mp_ptrs[] or node headers */
@@ -1677,7 +1698,7 @@ mdb_page_list(MDB_page *mp)
                key.mv_data = node->mn_data;
                nsize = NODESIZE + key.mv_size;
                if (IS_BRANCH(mp)) {
-                       fprintf(stderr, "key %d: page %"Z"u, %s\n", i, NODEPGNO(node),
+                       fprintf(stderr, "key %d: page %"Y"u, %s\n", i, NODEPGNO(node),
                                DKEY(&key));
                        total += nsize;
                } else {
@@ -1773,7 +1794,7 @@ static void mdb_audit(MDB_txn *txn)
                }
        }
        if (freecount + count + NUM_METAS != txn->mt_next_pgno) {
-               fprintf(stderr, "audit: %lu freecount: %lu count: %lu total: %lu next_pgno: %lu\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,
                        freecount+count+NUM_METAS, txn->mt_next_pgno);
        }
@@ -1790,8 +1811,8 @@ int
 mdb_dcmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, const MDB_val *b)
 {
        MDB_cmp_func *dcmp = txn->mt_dbxs[dbi].md_dcmp;
-#if UINT_MAX < SIZE_MAX
-       if (dcmp == mdb_cmp_int && a->mv_size == sizeof(size_t))
+#if UINT_MAX < SIZE_MAX || defined(MDB_VL32)
+       if (dcmp == mdb_cmp_int && a->mv_size == sizeof(mdb_size_t))
                dcmp = mdb_cmp_clong;
 #endif
        return dcmp(a, b);
@@ -1914,7 +1935,7 @@ mdb_page_loose(MDB_cursor *mc, MDB_page *mp)
                }
        }
        if (loose) {
-               DPRINTF(("loosen db %d page %"Z"u", DDBI(mc),
+               DPRINTF(("loosen db %d page %"Y"u", DDBI(mc),
                        mp->mp_pgno));
                NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs;
                txn->mt_loose_pgs = mp;
@@ -2210,7 +2231,7 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
                np = txn->mt_loose_pgs;
                txn->mt_loose_pgs = NEXT_LOOSE_PAGE(np);
                txn->mt_loose_count--;
-               DPRINTF(("db %d use loose page %"Z"u", DDBI(mc),
+               DPRINTF(("db %d use loose page %"Y"u", DDBI(mc),
                                np->mp_pgno));
                *mp = np;
                return MDB_SUCCESS;
@@ -2305,10 +2326,10 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
                }
                env->me_pglast = last;
 #if (MDB_DEBUG) > 1
-               DPRINTF(("IDL read txn %"Z"u root %"Z"u num %u",
+               DPRINTF(("IDL read txn %"Y"u root %"Y"u num %u",
                        last, txn->mt_dbs[FREE_DBI].md_root, i));
                for (j = i; j; j--)
-                       DPRINTF(("IDL %"Z"u", idl[j]));
+                       DPRINTF(("IDL %"Y"u", idl[j]));
 #endif
                /* Merge in descending sorted order */
                mdb_midl_xmerge(mop, idl);
@@ -2478,7 +2499,7 @@ mdb_page_touch(MDB_cursor *mc)
                        (rc = mdb_page_alloc(mc, 1, &np)))
                        goto fail;
                pgno = np->mp_pgno;
-               DPRINTF(("touched db %d page %"Z"u -> %"Z"u", DDBI(mc),
+               DPRINTF(("touched db %d page %"Y"u -> %"Y"u", DDBI(mc),
                        mp->mp_pgno, pgno));
                mdb_cassert(mc, mp->mp_pgno != pgno);
                mdb_midl_xappend(txn->mt_free_pgs, mp->mp_pgno);
@@ -2868,7 +2889,7 @@ mdb_txn_renew(MDB_txn *txn)
 
        rc = mdb_txn_renew0(txn);
        if (rc == MDB_SUCCESS) {
-               DPRINTF(("renew txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
+               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',
                        (void *)txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root));
        }
@@ -2968,7 +2989,7 @@ renew:
        } else {
                txn->mt_flags |= flags; /* could not change txn=me_txn0 earlier */
                *ret = txn;
-               DPRINTF(("begin txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
+               DPRINTF(("begin txn %"Y"u%c %p on mdbenv %p, root page %"Y"u",
                        txn->mt_txnid, (flags & MDB_RDONLY) ? 'r' : 'w',
                        (void *) txn, (void *) env, txn->mt_dbs[MAIN_DBI].md_root));
        }
@@ -2983,7 +3004,7 @@ mdb_txn_env(MDB_txn *txn)
        return txn->mt_env;
 }
 
-size_t
+mdb_size_t
 mdb_txn_id(MDB_txn *txn)
 {
     if(!txn) return 0;
@@ -3035,7 +3056,7 @@ mdb_txn_end(MDB_txn *txn, unsigned mode)
        /* Export or close DBI handles opened in this txn */
        mdb_dbis_update(txn, mode & MDB_END_UPDATE);
 
-       DPRINTF(("%s txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
+       DPRINTF(("%s txn %"Y"u%c %p on mdbenv %p, root page %"Y"u",
                names[mode & MDB_END_OPMASK],
                txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w',
                (void *) txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root));
@@ -3209,10 +3230,10 @@ mdb_freelist_save(MDB_txn *txn)
 #if (MDB_DEBUG) > 1
                        {
                                unsigned int i = free_pgs[0];
-                               DPRINTF(("IDL write txn %"Z"u root %"Z"u num %u",
+                               DPRINTF(("IDL write txn %"Y"u root %"Y"u num %u",
                                        txn->mt_txnid, txn->mt_dbs[FREE_DBI].md_root, i));
                                for (; i; i--)
-                                       DPRINTF(("IDL %"Z"u", free_pgs[i]));
+                                       DPRINTF(("IDL %"Y"u", free_pgs[i]));
                        }
 #endif
                        continue;
@@ -3323,15 +3344,16 @@ mdb_page_flush(MDB_txn *txn, int keep)
        MDB_ID2L        dl = txn->mt_u.dirty_list;
        unsigned        psize = env->me_psize, j;
        int                     i, pagecount = dl[0].mid, rc;
-       size_t          size = 0, pos = 0;
+       size_t          size = 0;
+       off_t           pos = 0;
        pgno_t          pgno = 0;
        MDB_page        *dp = NULL;
 #ifdef _WIN32
        OVERLAPPED      ov;
 #else
        struct iovec iov[MDB_COMMIT_PAGES];
-       ssize_t         wpos = 0, wsize = 0, wres;
-       size_t          next_pos = 1; /* impossible pos, so pos != next_pos */
+       ssize_t         wsize = 0, wres;
+       off_t           wpos = 0, next_pos = 1; /* impossible pos, so pos != next_pos */
        int                     n = 0;
 #endif
 
@@ -3430,7 +3452,7 @@ retry_seek:
                        wpos = pos;
                        wsize = 0;
                }
-               DPRINTF(("committing page %"Z"u", pgno));
+               DPRINTF(("committing page %"Y"u", pgno));
                next_pos = pos + size;
                iov[n].iov_len = size;
                iov[n].iov_base = (char *)dp;
@@ -3639,7 +3661,7 @@ mdb_txn_commit(MDB_txn *txn)
                !(txn->mt_flags & (MDB_TXN_DIRTY|MDB_TXN_SPILLS)))
                goto done;
 
-       DPRINTF(("committing txn %"Z"u %p on mdbenv %p, root page %"Z"u",
+       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));
 
        /* Update DB root pointers */
@@ -3737,7 +3759,7 @@ mdb_env_read_header(MDB_env *env, MDB_meta *meta)
                p = (MDB_page *)&pbuf;
 
                if (!F_ISSET(p->mp_flags, P_META)) {
-                       DPRINTF(("page %"Z"u not a meta page", p->mp_pgno));
+                       DPRINTF(("page %"Y"u not a meta page", p->mp_pgno));
                        return MDB_INVALID;
                }
 
@@ -3837,7 +3859,7 @@ mdb_env_write_meta(MDB_txn *txn)
        MDB_env *env;
        MDB_meta        meta, metab, *mp;
        unsigned flags;
-       size_t mapsize;
+       mdb_size_t mapsize;
        off_t off;
        int rc, len, toggle;
        char *ptr;
@@ -3849,7 +3871,7 @@ mdb_env_write_meta(MDB_txn *txn)
 #endif
 
        toggle = txn->mt_txnid & 1;
-       DPRINTF(("writing meta page %d for root page %"Z"u",
+       DPRINTF(("writing meta page %d for root page %"Y"u",
                toggle, txn->mt_dbs[MAIN_DBI].md_root));
 
        env = txn->mt_env;
@@ -4003,7 +4025,7 @@ mdb_env_map(MDB_env *env, void *addr)
        int access = SECTION_MAP_READ;
        HANDLE mh;
        void *map;
-       size_t msize;
+       SIZE_T msize;
        ULONG pageprot = PAGE_READONLY, secprot, alloctype;
 
        if (flags & MDB_WRITEMAP) {
@@ -4071,7 +4093,7 @@ mdb_env_map(MDB_env *env, void *addr)
 }
 
 int ESECT
-mdb_env_set_mapsize(MDB_env *env, size_t size)
+mdb_env_set_mapsize(MDB_env *env, mdb_size_t size)
 {
        /* If env is already open, caller is responsible for making
         * sure there are no active txns.
@@ -4132,7 +4154,7 @@ mdb_env_get_maxreaders(MDB_env *env, unsigned int *readers)
 }
 
 static int ESECT
-mdb_fsize(HANDLE fd, size_t *size)
+mdb_fsize(HANDLE fd, mdb_size_t *size)
 {
 #ifdef _WIN32
        LARGE_INTEGER fsize;
@@ -4246,7 +4268,7 @@ mdb_env_open2(MDB_env *env)
                /* Make sure mapsize >= committed data size.  Even when using
                 * mm_mapsize, which could be broken in old files (ITS#7789).
                 */
-               size_t minsize = (meta.mm_last_pg + 1) * meta.mm_psize;
+               mdb_size_t minsize = (meta.mm_last_pg + 1) * meta.mm_psize;
                if (env->me_mapsize < minsize)
                        env->me_mapsize = minsize;
        }
@@ -4308,11 +4330,11 @@ mdb_env_open2(MDB_env *env)
                        meta->mm_version, env->me_psize));
                DPRINTF(("using meta page %d",    (int) (meta->mm_txnid & 1)));
                DPRINTF(("depth: %u",             db->md_depth));
-               DPRINTF(("entries: %"Z"u",        db->md_entries));
-               DPRINTF(("branch pages: %"Z"u",   db->md_branch_pages));
-               DPRINTF(("leaf pages: %"Z"u",     db->md_leaf_pages));
-               DPRINTF(("overflow pages: %"Z"u", db->md_overflow_pages));
-               DPRINTF(("root: %"Z"u",           db->md_root));
+               DPRINTF(("entries: %"Y"u",        db->md_entries));
+               DPRINTF(("branch pages: %"Y"u",   db->md_branch_pages));
+               DPRINTF(("leaf pages: %"Y"u",     db->md_leaf_pages));
+               DPRINTF(("overflow pages: %"Y"u", db->md_overflow_pages));
+               DPRINTF(("root: %"Y"u",           db->md_root));
        }
 #endif
 
@@ -5131,18 +5153,18 @@ mdb_env_close(MDB_env *env)
        free(env);
 }
 
-/** Compare two items pointing at aligned size_t's */
+/** Compare two items pointing at aligned mdb_size_t's */
 static int
 mdb_cmp_long(const MDB_val *a, const MDB_val *b)
 {
-       return (*(size_t *)a->mv_data < *(size_t *)b->mv_data) ? -1 :
-               *(size_t *)a->mv_data > *(size_t *)b->mv_data;
+       return (*(mdb_size_t *)a->mv_data < *(mdb_size_t *)b->mv_data) ? -1 :
+               *(mdb_size_t *)a->mv_data > *(mdb_size_t *)b->mv_data;
 }
 
 /** Compare two items pointing at aligned unsigned int's.
  *
  *     This is also set as #MDB_INTEGERDUP|#MDB_DUPFIXED's #MDB_dbx.%md_dcmp,
- *     but #mdb_cmp_clong() is called instead if the data type is size_t.
+ *     but #mdb_cmp_clong() is called instead if the data type is mdb_size_t.
  */
 static int
 mdb_cmp_int(const MDB_val *a, const MDB_val *b)
@@ -5247,7 +5269,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
 
        nkeys = NUMKEYS(mp);
 
-       DPRINTF(("searching %u keys in %s %spage %"Z"u",
+       DPRINTF(("searching %u keys in %s %spage %"Y"u",
            nkeys, IS_LEAF(mp) ? "leaf" : "branch", IS_SUBP(mp) ? "sub-" : "",
            mdb_dbg_pgno(mp)));
 
@@ -5259,7 +5281,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
         * alignment is guaranteed. Use faster mdb_cmp_int.
         */
        if (cmp == mdb_cmp_cint && IS_BRANCH(mp)) {
-               if (NODEPTR(mp, 1)->mn_ksize == sizeof(size_t))
+               if (NODEPTR(mp, 1)->mn_ksize == sizeof(mdb_size_t))
                        cmp = mdb_cmp_long;
                else
                        cmp = mdb_cmp_int;
@@ -5295,7 +5317,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
                                DPRINTF(("found leaf index %u [%s], rc = %i",
                                    i, DKEY(&nodekey), rc));
                        else
-                               DPRINTF(("found branch index %u [%s -> %"Z"u], rc = %i",
+                               DPRINTF(("found branch index %u [%s -> %"Y"u], rc = %i",
                                    i, DKEY(&nodekey), NODEPGNO(node), rc));
 #endif
                        if (rc == 0)
@@ -5343,7 +5365,7 @@ static void
 mdb_cursor_pop(MDB_cursor *mc)
 {
        if (mc->mc_snum) {
-               DPRINTF(("popping page %"Z"u 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_snum--;
@@ -5359,7 +5381,7 @@ mdb_cursor_pop(MDB_cursor *mc)
 static int
 mdb_cursor_push(MDB_cursor *mc, MDB_page *mp)
 {
-       DPRINTF(("pushing page %"Z"u 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));
 
        if (mc->mc_snum >= CURSOR_STACK) {
@@ -5422,7 +5444,7 @@ mdb_page_get(MDB_txn *txn, pgno_t pgno, MDB_page **ret, int *lvl)
                level = 0;
                p = (MDB_page *)(env->me_map + env->me_psize * pgno);
        } else {
-               DPRINTF(("page %"Z"u not found", pgno));
+               DPRINTF(("page %"Y"u not found", pgno));
                txn->mt_flags |= MDB_TXN_ERROR;
                return MDB_PAGE_NOTFOUND;
        }
@@ -5448,13 +5470,13 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int flags)
                MDB_node        *node;
                indx_t          i;
 
-               DPRINTF(("branch page %"Z"u 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
                 * while in the process of rebalancing a FreeDB branch page; we must
                 * let that proceed. ITS#8336
                 */
                mdb_cassert(mc, !mc->mc_dbi || NUMKEYS(mp) > 1);
-               DPRINTF(("found index 0 to page %"Z"u", NODEPGNO(NODEPTR(mp, 0))));
+               DPRINTF(("found index 0 to page %"Y"u", NODEPGNO(NODEPTR(mp, 0))));
 
                if (flags & (MDB_PS_FIRST|MDB_PS_LAST)) {
                        i = 0;
@@ -5499,7 +5521,7 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int flags)
                return MDB_CORRUPTED;
        }
 
-       DPRINTF(("found leaf page %"Z"u for key [%s]", mp->mp_pgno,
+       DPRINTF(("found leaf page %"Y"u for key [%s]", mp->mp_pgno,
            key ? DKEY(key) : "null"));
        mc->mc_flags |= C_INITIALIZED;
        mc->mc_flags &= ~C_EOF;
@@ -5602,7 +5624,7 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
        mc->mc_snum = 1;
        mc->mc_top = 0;
 
-       DPRINTF(("db %d root page %"Z"u has flags 0x%X",
+       DPRINTF(("db %d root page %"Y"u has flags 0x%X",
                DDBI(mc), root, mc->mc_pg[0]->mp_flags));
 
        if (flags & MDB_PS_MODIFY) {
@@ -5627,7 +5649,7 @@ mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp)
        MDB_ID pn = pg << 1;
        int rc;
 
-       DPRINTF(("free ov page %"Z"u (%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,
         * 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.
@@ -5716,7 +5738,7 @@ mdb_node_read(MDB_txn *txn, MDB_node *leaf, MDB_val *data)
        data->mv_size = NODEDSZ(leaf);
        memcpy(&pgno, NODEDATA(leaf), sizeof(pgno));
        if ((rc = mdb_page_get(txn, pgno, &omp, NULL)) != 0) {
-               DPRINTF(("read overflow page %"Z"u failed", pgno));
+               DPRINTF(("read overflow page %"Y"u failed", pgno));
                return rc;
        }
        data->mv_data = METADATA(omp);
@@ -5765,7 +5787,7 @@ mdb_cursor_sibling(MDB_cursor *mc, int move_right)
        }
 
        mdb_cursor_pop(mc);
-       DPRINTF(("parent page is page %"Z"u, 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]));
 
        if (move_right ? (mc->mc_ki[mc->mc_top] + 1u >= NUMKEYS(mc->mc_pg[mc->mc_top]))
@@ -5836,7 +5858,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",
+       DPRINTF(("cursor_next: top page is %"Y"u in cursor %p",
                mdb_dbg_pgno(mp), (void *) mc));
        if (mc->mc_flags & C_DEL)
                goto skip;
@@ -5848,12 +5870,12 @@ mdb_cursor_next(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
                        return rc;
                }
                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 %"Y"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]));
        } else
                mc->mc_ki[mc->mc_top]++;
 
 skip:
-       DPRINTF(("==> cursor points to page %"Z"u 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]));
 
        if (IS_LEAF2(mp)) {
@@ -5915,7 +5937,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",
+       DPRINTF(("cursor_prev: top page is %"Y"u in cursor %p",
                mdb_dbg_pgno(mp), (void *) mc));
 
        if (mc->mc_ki[mc->mc_top] == 0)  {
@@ -5925,13 +5947,13 @@ mdb_cursor_prev(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
                }
                mp = mc->mc_pg[mc->mc_top];
                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 %"Y"u, key index %u", mp->mp_pgno, mc->mc_ki[mc->mc_top]));
        } else
                mc->mc_ki[mc->mc_top]--;
 
        mc->mc_flags &= ~C_EOF;
 
-       DPRINTF(("==> cursor points to page %"Z"u 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]));
 
        if (IS_LEAF2(mp)) {
@@ -6132,8 +6154,8 @@ set1:
                        if ((rc = mdb_node_read(mc->mc_txn, leaf, &olddata)) != MDB_SUCCESS)
                                return rc;
                        dcmp = mc->mc_dbx->md_dcmp;
-#if UINT_MAX < SIZE_MAX
-                       if (dcmp == mdb_cmp_int && olddata.mv_size == sizeof(size_t))
+#if UINT_MAX < SIZE_MAX || defined(MDB_VL32)
+                       if (dcmp == mdb_cmp_int && olddata.mv_size == sizeof(mdb_size_t))
                                dcmp = mdb_cmp_clong;
 #endif
                        rc = dcmp(data, &olddata);
@@ -6655,8 +6677,8 @@ more:
                                if (flags == MDB_CURRENT)
                                        goto current;
                                dcmp = mc->mc_dbx->md_dcmp;
-#if UINT_MAX < SIZE_MAX
-                               if (dcmp == mdb_cmp_int && olddata.mv_size == sizeof(size_t))
+#if UINT_MAX < SIZE_MAX || defined(MDB_VL32)
+                               if (dcmp == mdb_cmp_int && olddata.mv_size == sizeof(mdb_size_t))
                                        dcmp = mdb_cmp_clong;
 #endif
                                /* does data match? */
@@ -7107,7 +7129,7 @@ mdb_page_new(MDB_cursor *mc, uint32_t flags, int num, MDB_page **mp)
 
        if ((rc = mdb_page_alloc(mc, num, &np)))
                return rc;
-       DPRINTF(("allocated new mpage %"Z"u, page size %u",
+       DPRINTF(("allocated new mpage %"Y"u, page size %u",
            np->mp_pgno, mc->mc_txn->mt_env->me_psize));
        np->mp_flags = flags | P_DIRTY;
        np->mp_lower = (PAGEHDRSZ-PAGEBASE);
@@ -7207,7 +7229,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
 
        mdb_cassert(mc, 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 %"Y"u index %i, data size %"Z"u key size %"Z"u [%s]",
            IS_LEAF(mp) ? "leaf" : "branch",
                IS_SUBP(mp) ? "sub-" : "",
                mdb_dbg_pgno(mp), indx, data ? data->mv_size : 0,
@@ -7248,7 +7270,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
                                goto full;
                        if ((rc = mdb_page_new(mc, P_OVERFLOW, ovpages, &ofp)))
                                return rc;
-                       DPRINTF(("allocated overflow page %"Z"u", ofp->mp_pgno));
+                       DPRINTF(("allocated overflow page %"Y"u", ofp->mp_pgno));
                        flags |= F_BIGDATA;
                        goto update;
                } else {
@@ -7305,7 +7327,7 @@ update:
        return MDB_SUCCESS;
 
 full:
-       DPRINTF(("not enough room in page %"Z"u, got %u ptrs",
+       DPRINTF(("not enough room in page %"Y"u, got %u ptrs",
                mdb_dbg_pgno(mp), NUMKEYS(mp)));
        DPRINTF(("upper-lower = %u - %u = %"Z"d", mp->mp_upper,mp->mp_lower,room));
        DPRINTF(("node size = %"Z"u", node_size));
@@ -7328,7 +7350,7 @@ mdb_node_del(MDB_cursor *mc, int ksize)
        MDB_node        *node;
        char            *base;
 
-       DPRINTF(("delete node %u on %s page %"Z"u", indx,
+       DPRINTF(("delete node %u on %s page %"Y"u", indx,
            IS_LEAF(mp) ? "leaf" : "branch", mdb_dbg_pgno(mp)));
        numkeys = NUMKEYS(mp);
        mdb_cassert(mc, indx < numkeys);
@@ -7484,11 +7506,11 @@ mdb_xcursor_init1(MDB_cursor *mc, MDB_node *node)
                                mx->mx_db.md_flags |= MDB_INTEGERKEY;
                }
        }
-       DPRINTF(("Sub-db -%u root page %"Z"u", 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_dbflag = DB_VALID|DB_USRVALID|DB_DIRTY; /* DB_DIRTY guides mdb_cursor_touch */
-#if UINT_MAX < SIZE_MAX
-       if (mx->mx_dbx.md_cmp == mdb_cmp_int && mx->mx_db.md_pad == sizeof(size_t))
+#if UINT_MAX < SIZE_MAX || defined(MDB_VL32)
+       if (mx->mx_dbx.md_cmp == mdb_cmp_int && mx->mx_db.md_pad == sizeof(mdb_size_t))
                mx->mx_dbx.md_cmp = mdb_cmp_clong;
 #endif
 }
@@ -7521,7 +7543,7 @@ mdb_xcursor_init2(MDB_cursor *mc, MDB_xcursor *src_mx, int new_dupdata)
        }
        mx->mx_db = src_mx->mx_db;
        mx->mx_cursor.mc_pg[0] = src_mx->mx_cursor.mc_pg[0];
-       DPRINTF(("Sub-db -%u root page %"Z"u", mx->mx_cursor.mc_dbi,
+       DPRINTF(("Sub-db -%u root page %"Y"u", mx->mx_cursor.mc_dbi,
                mx->mx_db.md_root));
 }
 
@@ -7690,7 +7712,7 @@ mdb_update_key(MDB_cursor *mc, MDB_val *key)
                char kbuf2[DKBUF_MAXKEYSIZE*2+1];
                k2.mv_data = NODEKEY(node);
                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 %"Y"u",
                        indx, ptr,
                        mdb_dkey(&k2, kbuf2),
                        DKEY(key),
@@ -7838,7 +7860,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
                        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 %"Y"u to node %u on page %"Y"u",
            IS_LEAF(csrc->mc_pg[csrc->mc_top]) ? "leaf" : "branch",
            csrc->mc_ki[csrc->mc_top],
                DKEY(&key),
@@ -7932,7 +7954,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
                                key.mv_size = NODEKSZ(srcnode);
                                key.mv_data = NODEKEY(srcnode);
                        }
-                       DPRINTF(("update separator for source page %"Z"u to [%s]",
+                       DPRINTF(("update separator for source page %"Y"u to [%s]",
                                csrc->mc_pg[csrc->mc_top]->mp_pgno, DKEY(&key)));
                        mdb_cursor_copy(csrc, &mn);
                        mn.mc_snum--;
@@ -7963,7 +7985,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
                                key.mv_size = NODEKSZ(srcnode);
                                key.mv_data = NODEKEY(srcnode);
                        }
-                       DPRINTF(("update separator for destination page %"Z"u to [%s]",
+                       DPRINTF(("update separator for destination page %"Y"u to [%s]",
                                cdst->mc_pg[cdst->mc_top]->mp_pgno, DKEY(&key)));
                        mdb_cursor_copy(cdst, &mn);
                        mn.mc_snum--;
@@ -8009,7 +8031,7 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
        psrc = csrc->mc_pg[csrc->mc_top];
        pdst = cdst->mc_pg[cdst->mc_top];
 
-       DPRINTF(("merging page %"Z"u into %"Z"u", 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, cdst->mc_snum > 1);
@@ -8066,7 +8088,7 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
                }
        }
 
-       DPRINTF(("dst page %"Z"u now has %u keys (%.1f%% filled)",
+       DPRINTF(("dst page %"Y"u now has %u keys (%.1f%% filled)",
            pdst->mp_pgno, NUMKEYS(pdst),
                (float)PAGEFILL(cdst->mc_txn->mt_env, pdst) / 10));
 
@@ -8182,14 +8204,14 @@ mdb_rebalance(MDB_cursor *mc)
                minkeys = 1;
                thresh = FILL_THRESHOLD;
        }
-       DPRINTF(("rebalancing %s page %"Z"u (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",
            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));
 
        if (PAGEFILL(mc->mc_txn->mt_env, mc->mc_pg[mc->mc_top]) >= thresh &&
                NUMKEYS(mc->mc_pg[mc->mc_top]) >= minkeys) {
-               DPRINTF(("no need to rebalance page %"Z"u, above fill threshold",
+               DPRINTF(("no need to rebalance page %"Y"u, above fill threshold",
                    mdb_dbg_pgno(mc->mc_pg[mc->mc_top])));
                return MDB_SUCCESS;
        }
@@ -8318,7 +8340,7 @@ mdb_rebalance(MDB_cursor *mc)
                fromleft = 1;
        }
 
-       DPRINTF(("found neighbor page %"Z"u (%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]),
                (float)PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) / 10));
 
@@ -8520,7 +8542,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
        newindx = mc->mc_ki[mc->mc_top];
        nkeys = NUMKEYS(mp);
 
-       DPRINTF(("-----> splitting %s page %"Z"u 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,
            DKEY(newkey), mc->mc_ki[mc->mc_top], nkeys));
 
@@ -8528,7 +8550,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)))
                return rc;
        rp->mp_pad = mp->mp_pad;
-       DPRINTF(("new right sibling: page %"Z"u", rp->mp_pgno));
+       DPRINTF(("new right sibling: page %"Y"u", rp->mp_pgno));
 
        /* Usually when splitting the root page, the cursor
         * height is 1. But when called from mdb_update_key,
@@ -8546,7 +8568,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
                mc->mc_pg[0] = pp;
                mc->mc_ki[0] = 0;
                mc->mc_db->md_root = pp->mp_pgno;
-               DPRINTF(("root split! new root = %"Z"u", pp->mp_pgno));
+               DPRINTF(("root split! new root = %"Y"u", pp->mp_pgno));
                new_root = mc->mc_db->md_depth++;
 
                /* Add left (implicit) pointer. */
@@ -8563,7 +8585,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
                ptop = 0;
        } else {
                ptop = mc->mc_top-1;
-               DPRINTF(("parent branch page is %"Z"u", mc->mc_pg[ptop]->mp_pgno));
+               DPRINTF(("parent branch page is %"Y"u", mc->mc_pg[ptop]->mp_pgno));
        }
 
        mdb_cursor_copy(mc, &mn);
@@ -9388,7 +9410,7 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
 
        w2 = txn->mt_next_pgno * env->me_psize;
        {
-               size_t fsize = 0;
+               mdb_size_t fsize = 0;
                if ((rc = mdb_fsize(env->me_fd, &fsize)))
                        goto leave;
                if (w2 > fsize)
@@ -10010,7 +10032,7 @@ mdb_reader_list(MDB_env *env, MDB_msg_func *func, void *ctx)
                if (mr[i].mr_pid) {
                        txnid_t txnid = mr[i].mr_txnid;
                        sprintf(buf, txnid == (txnid_t)-1 ?
-                               "%10d %"Z"x -\n" : "%10d %"Z"x %"Z"u\n",
+                               "%10d %"Z"x -\n" : "%10d %"Z"x %"Y"u\n",
                                (int)mr[i].mr_pid, (size_t)mr[i].mr_tid, txnid);
                        if (first) {
                                first = 0;
@@ -10115,7 +10137,7 @@ mdb_reader_check0(MDB_env *env, int rlocked, int *dead)
                                        }
                                        for (; j<rdrs; j++)
                                                        if (mr[j].mr_pid == pid) {
-                                                               DPRINTF(("clear stale reader pid %u txn %"Z"d",
+                                                               DPRINTF(("clear stale reader pid %u txn %"Y"d",
                                                                        (unsigned) pid, mr[j].mr_txnid));
                                                                mr[j].mr_pid = 0;
                                                                count++;

diff --git a/libraries/liblmdb/mdb_dump.c b/libraries/liblmdb/mdb_dump.c
index 16c0aae1b734e2065f99d2c86c30d457e57217cb..72a469052dc41130cb1ac9f37cd480dec3ac3c1b 100644 (file)
--- a/libraries/liblmdb/mdb_dump.c
+++ b/libraries/liblmdb/mdb_dump.c
@@ -25,6 +25,15 @@
 #else
 #define Z      "z"
 #endif
+#ifdef MDB_VL32
+#ifdef _WIN32
+#define        Y       "I64"
+#else
+#define        Y       "ll"
+#endif
+#else
+#define Y      Z
+#endif
 
 #define PRINT  1
 static int mode;
@@ -115,7 +124,7 @@ static int dumpit(MDB_txn *txn, MDB_dbi dbi, char *name)
        if (name)
                printf("database=%s\n", name);
        printf("type=btree\n");
-       printf("mapsize=%" Z "u\n", info.me_mapsize);
+       printf("mapsize=%" Y "u\n", info.me_mapsize);
        if (info.me_mapaddr)
                printf("mapaddr=%p\n", info.me_mapaddr);
        printf("maxreaders=%u\n", info.me_maxreaders);

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index d2f0968188a3b9258a6bbb62a4fbc1b522b1a38c..d1fda4bf59c5d7016b44aee4f95be9ed00bcad51 100644 (file)
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -43,6 +43,15 @@ static MDB_val kbuf, dbuf;
 #else
 #define Z      "z"
 #endif
+#ifdef MDB_VL32
+#ifdef _WIN32
+#define        Y       "I64"
+#else
+#define        Y       "ll"
+#endif
+#else
+#define Y      Z
+#endif
 
 #define STRLENOF(s)    (sizeof(s)-1)
 
@@ -112,7 +121,7 @@ static void readhdr(void)
                        int i;
                        ptr = memchr(dbuf.mv_data, '\n', dbuf.mv_size);
                        if (ptr) *ptr = '\0';
-                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Z "u", &info.me_mapsize);
+                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Y "u", &info.me_mapsize);
                        if (i != 1) {
                                fprintf(stderr, "%s: line %" Z "d: invalid mapsize %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapsize="));

diff --git a/libraries/liblmdb/mdb_stat.c b/libraries/liblmdb/mdb_stat.c
index 6f4b3ee4f361817615b3fc8761d6fc311dcb2258..b785e7acf04814b0e15cdbb08282a4ddf389b0ce 100644 (file)
--- a/libraries/liblmdb/mdb_stat.c
+++ b/libraries/liblmdb/mdb_stat.c
@@ -22,6 +22,15 @@
 #else
 #define        Z       "z"
 #endif
+#ifdef MDB_VL32
+#ifdef _WIN32
+#define        Y       "I64"
+#else
+#define        Y       "ll"
+#endif
+#else
+#define Y      Z
+#endif
 
 static void prstat(MDB_stat *ms)
 {
@@ -29,10 +38,10 @@ static void prstat(MDB_stat *ms)
        printf("  Page size: %u\n", ms->ms_psize);
 #endif
        printf("  Tree depth: %u\n", ms->ms_depth);
-       printf("  Branch pages: %"Z"u\n", ms->ms_branch_pages);
-       printf("  Leaf pages: %"Z"u\n", ms->ms_leaf_pages);
-       printf("  Overflow pages: %"Z"u\n", ms->ms_overflow_pages);
-       printf("  Entries: %"Z"u\n", ms->ms_entries);
+       printf("  Branch pages: %"Y"u\n", ms->ms_branch_pages);
+       printf("  Leaf pages: %"Y"u\n", ms->ms_leaf_pages);
+       printf("  Overflow pages: %"Y"u\n", ms->ms_overflow_pages);
+       printf("  Entries: %"Y"u\n", ms->ms_entries);
 }
 
 static void usage(char *prog)
@@ -125,11 +134,11 @@ int main(int argc, char *argv[])
                (void)mdb_env_info(env, &mei);
                printf("Environment Info\n");
                printf("  Map address: %p\n", mei.me_mapaddr);
-               printf("  Map size: %"Z"u\n", mei.me_mapsize);
+               printf("  Map size: %"Y"u\n", mei.me_mapsize);
                printf("  Page size: %u\n", mst.ms_psize);
-               printf("  Max pages: %"Z"u\n", mei.me_mapsize / mst.ms_psize);
-               printf("  Number of pages used: %"Z"u\n", mei.me_last_pgno+1);
-               printf("  Last transaction ID: %"Z"u\n", mei.me_last_txnid);
+               printf("  Max pages: %"Y"u\n", mei.me_mapsize / mst.ms_psize);
+               printf("  Number of pages used: %"Y"u\n", mei.me_last_pgno+1);
+               printf("  Last transaction ID: %"Y"u\n", mei.me_last_txnid);
                printf("  Max readers: %u\n", mei.me_maxreaders);
                printf("  Number of readers used: %u\n", mei.me_numreaders);
        }

diff --git a/libraries/liblmdb/midl.h b/libraries/liblmdb/midl.h
index 2331e7839847d0629bfaea95981aa59d8866e187..8ca1653a1ddfcb49db11e35a662848fa05021843 100644 (file)
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
@@ -27,6 +27,7 @@
 #define _MDB_MIDL_H_
 
 #include <stddef.h>
+#include <inttypes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,7 +43,11 @@ extern "C" {
        /** A generic unsigned ID number. These were entryIDs in back-bdb.
         *      Preferably it should have the same size as a pointer.
         */
+#ifdef MDB_VL32
+typedef uint64_t MDB_ID;
+#else
 typedef size_t MDB_ID;
+#endif
 
        /** An IDL is an ID List, a sorted array of IDs. The first
         * element of the array is a counter for how many actual
@@ -55,7 +60,11 @@ typedef MDB_ID *MDB_IDL;
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
  */
+#ifdef MDB_VL32
+#define        MDB_IDL_LOGN    10      /* DB_SIZE is 2^10, UM_SIZE is 2^11 */
+#else
 #define        MDB_IDL_LOGN    16      /* DB_SIZE is 2^16, UM_SIZE is 2^17 */
+#endif
 #define MDB_IDL_DB_SIZE                (1<<MDB_IDL_LOGN)
 #define MDB_IDL_UM_SIZE                (1<<(MDB_IDL_LOGN+1))