Relax MDB_MAXKEYSIZE for existing data.

Handle keys stored by a liblmdb with a bigger MDB_MAXKEYSIZE.
mdb_get/mdb_del(absent key bigger than our MDB_MAXKEYSIZE)
now return MDB_NOTFOUND instead of MDB_BAD_VALSIZE.

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index fb512bf9d8165b12dd30984c53454a06167d9b1c..95dde812f1e9e326ac720d1143ae0a15abd535fc 100644 (file)
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -797,12 +797,12 @@ int  mdb_env_get_maxreaders(MDB_env *env, unsigned int *readers);
         */
 int  mdb_env_set_maxdbs(MDB_env *env, MDB_dbi dbs);
 
-       /** @brief Get the maximum size of a key for the environment.
+       /** @brief Get the maximum size of keys and #MDB_DUPSORT data we can write.
         *
         * This is the compile-time constant #MDB_MAXKEYSIZE, default 511.
         * See @ref MDB_val.
         * @param[in] env An environment handle returned by #mdb_env_create()
-        * @return The maximum size of a key
+        * @return The maximum size of a key we can write
         */
 int  mdb_env_get_maxkeysize(MDB_env *env);
 

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index d21d6fcbfec916168a2deb903b27feb646312328..ecf29bfa46847586a91ebd597b38dc9ed721fe39 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -382,10 +382,7 @@ static txnid_t mdb_debug_start;
        /**     The version number for a database's lockfile format. */
 #define MDB_LOCK_VERSION        1
 
-       /**     @brief The maximum size of a key in the database.
-        *
-        *      The library rejects bigger keys, and cannot deal with records
-        *      with bigger keys stored by a library with bigger max keysize.
+       /**     @brief The maximum size of a key we can write to a database.
         *
         *      We require that keys all fit onto a regular page. This limit
         *      could be raised a bit further if needed; to something just
@@ -4972,10 +4969,6 @@ mdb_get(MDB_txn *txn, MDB_dbi dbi,
        if (txn->mt_flags & MDB_TXN_ERROR)
                return MDB_BAD_TXN;
 
-       if (key->mv_size > MDB_MAXKEYSIZE) {
-               return MDB_BAD_VALSIZE;
-       }
-
        mdb_cursor_init(&mc, txn, dbi, &mx);
        return mdb_cursor_set(&mc, key, data, MDB_SET, &exact);
 }
@@ -5531,12 +5524,10 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
        case MDB_SET_RANGE:
                if (key == NULL) {
                        rc = EINVAL;
-               } else if (key->mv_size > MDB_MAXKEYSIZE) {
-                       rc = MDB_BAD_VALSIZE;
-               } else if (op == MDB_SET_RANGE)
-                       rc = mdb_cursor_set(mc, key, data, op, NULL);
-               else
-                       rc = mdb_cursor_set(mc, key, data, op, &exact);
+               } else {
+                       rc = mdb_cursor_set(mc, key, data, op,
+                               op == MDB_SET_RANGE ? NULL : &exact);
+               }
                break;
        case MDB_GET_MULTIPLE:
                if (data == NULL || !(mc->mc_flags & C_INITIALIZED)) {
@@ -5681,7 +5672,6 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
        unsigned int mcount = 0, dcount = 0, nospill;
        size_t nsize;
        int rc, rc2;
-       char dbuf[MDB_MAXKEYSIZE+1];
        unsigned int nflags;
        DKBUF;
 
@@ -5846,9 +5836,9 @@ more:
 
                                /* Back up original data item */
                                dkey.mv_size = olddata.mv_size;
-                               dkey.mv_data = memcpy(dbuf, olddata.mv_data, olddata.mv_size);
+                               dkey.mv_data = memcpy(fp+1, olddata.mv_data, olddata.mv_size);
 
-                               /* create a fake page for the dup items */
+                               /* Make sub-page header for the dup items, with dummy body */
                                fp->mp_flags = P_LEAF|P_DIRTY|P_SUBP;
                                fp->mp_lower = PAGEHDRSZ;
                                xdata.mv_size = PAGEHDRSZ + dkey.mv_size + data->mv_size;
@@ -7395,10 +7385,6 @@ mdb_del(MDB_txn *txn, MDB_dbi dbi,
        if (txn->mt_flags & (MDB_TXN_RDONLY|MDB_TXN_ERROR))
                return (txn->mt_flags & MDB_TXN_RDONLY) ? EACCES : MDB_BAD_TXN;
 
-       if (key->mv_size > MDB_MAXKEYSIZE) {
-               return MDB_BAD_VALSIZE;
-       }
-
        mdb_cursor_init(&mc, txn, dbi, &mx);
 
        exact = 0;