Fix prev commit

[openldap] / libraries / liblmdb / mdb.c

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 5558875872163b2ced0fcf796ed486235316eaca..4109e71c3481424a3b72b6bbb3fc8effdd42b96f 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -114,7 +114,7 @@
 #define BIG_ENDIAN     __BIG_ENDIAN
 #endif
 
-#if defined(__i386) || defined(__x86_64)
+#if defined(__i386) || defined(__x86_64) || defined(_M_IX86)
 #define MISALIGNED_OK  1
 #endif
 
@@ -199,12 +199,6 @@ mdb_sem_wait(sem_t *sem)
         */
 #define        ErrCode()       errno
 
-       /** An abstraction for a file handle.
-        *      On POSIX systems file handles are small integers. On Windows
-        *      they're opaque pointers.
-        */
-#define        HANDLE  int
-
        /**     A value for an invalid file handle.
         *      Mainly used to initialize file variables and signify that they are
         *      unused.
@@ -1636,6 +1630,8 @@ finish:
                                if (m2 == mc || m2->mc_snum < mc->mc_snum) continue;
                                if (m2->mc_pg[mc->mc_top] == mc->mc_pg[mc->mc_top]) {
                                        m2->mc_pg[mc->mc_top] = mp;
+                                       if (mc->mc_db->md_flags & MDB_DUPSORT)
+                                               m2->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED;
                                }
                        }
                }
@@ -3629,60 +3625,19 @@ mdb_env_close0(MDB_env *env, int excl)
 }
 
 int
-mdb_env_copy(MDB_env *env, const char *path)
+mdb_env_copyfd(MDB_env *env, int fd)
 {
        MDB_txn *txn = NULL;
-       int rc, len;
+       int rc;
        size_t wsize;
-       char *lpath, *ptr;
-       HANDLE newfd = INVALID_HANDLE_VALUE;
-
-       if (env->me_flags & MDB_NOSUBDIR) {
-               lpath = (char *)path;
-       } else {
-               len = strlen(path);
-               len += sizeof(DATANAME);
-               lpath = malloc(len);
-               if (!lpath)
-                       return ENOMEM;
-               sprintf(lpath, "%s" DATANAME, path);
-       }
-
-       /* The destination path must exist, but the destination file must not.
-        * We don't want the OS to cache the writes, since the source data is
-        * already in the OS cache.
-        */
-#ifdef _WIN32
-       newfd = CreateFile(lpath, GENERIC_WRITE, 0, NULL, CREATE_NEW,
-                               FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH, NULL);
-#else
-       newfd = open(lpath, O_WRONLY|O_CREAT|O_EXCL
-#ifdef O_DIRECT
-               |O_DIRECT
-#endif
-               , 0666);
-#endif
-       if (!(env->me_flags & MDB_NOSUBDIR))
-               free(lpath);
-       if (newfd == INVALID_HANDLE_VALUE) {
-               rc = ErrCode();
-               goto leave;
-       }
-
-#ifdef F_NOCACHE       /* __APPLE__ */
-       rc = fcntl(newfd, F_NOCACHE, 1);
-       if (rc) {
-               rc = ErrCode();
-               goto leave;
-       }
-#endif
+       char *ptr;
 
        /* Do the lock/unlock of the reader mutex before starting the
         * write txn.  Otherwise other read txns could block writers.
         */
        rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn);
        if (rc)
-               goto leave;
+               return rc;
 
        if (env->me_txns) {
                /* We must start the actual read txn after blocking writers */
@@ -3702,11 +3657,11 @@ mdb_env_copy(MDB_env *env, const char *path)
 #ifdef _WIN32
        {
                DWORD len;
-               rc = WriteFile(newfd, env->me_map, wsize, &len, NULL);
+               rc = WriteFile(fd, env->me_map, wsize, &len, NULL);
                rc = (len == wsize) ? MDB_SUCCESS : ErrCode();
        }
 #else
-       rc = write(newfd, env->me_map, wsize);
+       rc = write(fd, env->me_map, wsize);
        rc = (rc == (int)wsize) ? MDB_SUCCESS : ErrCode();
 #endif
        if (env->me_txns)
@@ -3725,7 +3680,7 @@ mdb_env_copy(MDB_env *env, const char *path)
                        w2 = MAX_WRITE;
                else
                        w2 = wsize;
-               rc = WriteFile(newfd, ptr, w2, &len, NULL);
+               rc = WriteFile(fd, ptr, w2, &len, NULL);
                rc = (len == w2) ? MDB_SUCCESS : ErrCode();
                if (rc) break;
                wsize -= w2;
@@ -3739,7 +3694,7 @@ mdb_env_copy(MDB_env *env, const char *path)
                        w2 = MAX_WRITE;
                else
                        w2 = wsize;
-               wres = write(newfd, ptr, w2);
+               wres = write(fd, ptr, w2);
                rc = (wres > 0) ? MDB_SUCCESS : ErrCode();
                if (rc) break;
                wsize -= wres;
@@ -3749,6 +3704,59 @@ mdb_env_copy(MDB_env *env, const char *path)
 
 leave:
        mdb_txn_abort(txn);
+       return rc;
+}
+
+int
+mdb_env_copy(MDB_env *env, const char *path)
+{
+       int rc, len;
+       char *lpath;
+       HANDLE newfd = INVALID_HANDLE_VALUE;
+
+       if (env->me_flags & MDB_NOSUBDIR) {
+               lpath = (char *)path;
+       } else {
+               len = strlen(path);
+               len += sizeof(DATANAME);
+               lpath = malloc(len);
+               if (!lpath)
+                       return ENOMEM;
+               sprintf(lpath, "%s" DATANAME, path);
+       }
+
+       /* The destination path must exist, but the destination file must not.
+        * We don't want the OS to cache the writes, since the source data is
+        * already in the OS cache.
+        */
+#ifdef _WIN32
+       newfd = CreateFile(lpath, GENERIC_WRITE, 0, NULL, CREATE_NEW,
+                               FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH, NULL);
+#else
+       newfd = open(lpath, O_WRONLY|O_CREAT|O_EXCL
+#ifdef O_DIRECT
+               |O_DIRECT
+#endif
+               , 0666);
+#endif
+       if (!(env->me_flags & MDB_NOSUBDIR))
+               free(lpath);
+       if (newfd == INVALID_HANDLE_VALUE) {
+               rc = ErrCode();
+               goto leave;
+       }
+
+#ifdef F_NOCACHE       /* __APPLE__ */
+       rc = fcntl(newfd, F_NOCACHE, 1);
+       if (rc) {
+               rc = ErrCode();
+               goto leave;
+       }
+#endif
+
+       rc = mdb_env_copyfd(env, newfd);
+
+leave:
        if (newfd != INVALID_HANDLE_VALUE)
                close(newfd);