From 3f241365d5b3c0afdca888248a90a137d0b8b3d5 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 12 Jan 2014 17:37:04 -0800 Subject: [PATCH 1/3] Make sure mapsize changes take effect on Windows. --- libraries/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index b6e2f842c7..6ca890fdf3 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -3556,7 +3556,7 @@ mdb_env_open2(MDB_env *env) env->me_mapsize = minsize; } - rc = mdb_env_map(env, meta.mm_address, newenv); + rc = mdb_env_map(env, meta.mm_address, newenv || env->me_mapsize != meta.mm_mapsize); if (rc) return rc; From 98f3bc88bf4b268f14b9c415aa138dfdd05bfe05 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 13 Jan 2014 20:46:08 +0100 Subject: [PATCH 2/3] Revert "ITS#7772 Reduce spurious sub-page growth." This reverts commit 75494c08b49c3ef77dce8a00f2bc44c83658c1a7, which must await a fix to ITS#7771 (DUPSORT cursor tracking). --- libraries/liblmdb/mdb.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 6ca890fdf3..7e2905891e 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -5912,7 +5912,7 @@ more: * it. mp: new (sub-)page. offset: growth in page * size. xdata: node data with new page or DB. */ - ssize_t i, offset = 0; + unsigned i, offset = 0; mp = fp = xdata.mv_data = env->me_pbuf; mp->mp_pgno = mc->mc_pg[mc->mc_top]->mp_pgno; @@ -5968,17 +5968,17 @@ more: fp = olddata.mv_data; switch (flags) { default: - i = -(ssize_t)SIZELEFT(fp); if (!(mc->mc_db->md_flags & MDB_DUPFIXED)) { - offset = i += (ssize_t) EVEN( - sizeof(indx_t) + NODESIZE + data->mv_size); - } else { - i += offset = fp->mp_pad; - offset *= 4; /* space for 4 more */ - } - if (i > 0) + offset = EVEN(NODESIZE + sizeof(indx_t) + + data->mv_size); break; - /* FALLTHRU: Sub-page is big enough */ + } + offset = fp->mp_pad; + if (SIZELEFT(fp) < offset) { + offset *= 4; /* space for 4 more */ + break; + } + /* FALLTHRU: Big enough MDB_DUPFIXED sub-page */ case MDB_CURRENT: fp->mp_flags |= P_DIRTY; COPY_PGNO(fp->mp_pgno, mp->mp_pgno); @@ -6027,7 +6027,7 @@ prep_subDB: } else { memcpy((char *)mp + mp->mp_upper, (char *)fp + fp->mp_upper, olddata.mv_size - fp->mp_upper); - for (i = NUMKEYS(fp); --i >= 0; ) + for (i=0; imp_ptrs[i] = fp->mp_ptrs[i] + offset; } } From ec97f49a6552a8ed599472d665ec7c16463b808c Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 14 Jan 2014 17:12:48 -0800 Subject: [PATCH 3/3] Note changes for LMDB 0.9.11 --- libraries/liblmdb/CHANGES | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index a61798765b..95bf833c76 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -1,5 +1,16 @@ LMDB 0.9 Change Log +LMDB 0.9.11 Release (2014/01/15) + Add mdb_env_set_assert() (ITS#7775) + Fix: invalidate txn on page allocation errors (ITS#7377) + Fix xcursor tracking in mdb_cursor_del0() (ITS#7771) + Fix corruption from deletes (ITS#7756) + Fix Windows/MSVC build issues + Raise safe limit of max MDB_MAXKEYSIZE + Misc code cleanup + Documentation + Remove spurious note about non-overlapping flags (ITS#7665) + LMDB 0.9.10 Release (2013/11/12) Add MDB_NOMEMINIT option Fix mdb_page_split() again (ITS#7589)