Replace the sqlite3_io_methods.xMremap interface with sqlite3_io_methods.xFetch and xUnfetch.

FossilOrigin-Name: 1431be95579160fb70408d43e17fc23c7b69ab4a

1 files changed, 7 insertions, 23 deletions

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index c0a280378..666a2e084 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -707,24 +707,6 @@ struct sqlite3_file {
 ** fails to zero-fill short reads might seem to work.  However,
 ** failure to zero-fill short reads will eventually lead to
 ** database corruption.
-**
-** Assuming parameter nNew is non-zero, the xMremap method should attempt
-** to memory map a region nNew bytes in size starting at offset iOffset
-** of the file.  If successful, it should set *ppMap to point to the
-** mapping and return SQLITE_OK. If the file is opened for read-write
-** access, then the mapping should also be read-write.
-**
-** If nOld is non-zero, then the initial value of *ppMap points to a
-** mapping returned by a previous call to xMremap. The existing mapping
-** is nOld bytes in size and starts at offset iOffset of the file. In
-** this case the xMremap method is expected to unmap the existing mapping
-** and overwrite *ppMap with the pointer to the new mapping. If nOld is
-** zero, then the initial value of *ppMap is undefined.
-**
-** If nNew is zero, then no new mapping should be created. Any old
-** mapping must still be unmapped if nOld is non-zero. If the nOld
-** parameter is non-zero, then the existing mapping is always unmapped -
-** even if an error occurs.
 */
 typedef struct sqlite3_io_methods sqlite3_io_methods;
 struct sqlite3_io_methods {
@@ -747,14 +729,12 @@ struct sqlite3_io_methods {
   void (*xShmBarrier)(sqlite3_file*);
   int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
   /* Methods above are valid for version 2 */
-  int (*xMremap)(sqlite3_file *fd, int flags,
-      sqlite3_int64 iOff, sqlite3_int64 nOld, sqlite3_int64 nNew, void **ppMap);
+  int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
+  int (*xUnfetch)(sqlite3_file*, void *p);
   /* Methods above are valid for version 3 */
   /* Additional methods may be added in future releases */
 };
 
-#define SQLITE_MREMAP_EXTEND  0x0001        /* xMremap call may extend file */
-
 /*
 ** CAPI3REF: Standard File Control Opcodes
 **
@@ -906,6 +886,10 @@ struct sqlite3_io_methods {
 ** written into memory obtained from [sqlite3_malloc()].  The caller should
 ** invoke [sqlite3_free()] on the result to avoid a memory leak.
 **
+** <li>[[SQLITE_FCNTL_MMAP_SIZE]]
+** The argument is assumed to point to a value of type sqlite3_int64. An
+** advisory maximum amount of this file to memory map in bytes.
+**
 ** </ul>
 */
 #define SQLITE_FCNTL_LOCKSTATE               1
@@ -924,7 +908,7 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_PRAGMA                 14
 #define SQLITE_FCNTL_BUSYHANDLER            15
 #define SQLITE_FCNTL_TEMPFILENAME           16
-#define SQLITE_FCNTL_GETFD                  17
+#define SQLITE_FCNTL_MMAP_SIZE              18
 
 /*
 ** CAPI3REF: Mutex Handle