Make the "nolock" VFS on unix a version-3 VFS so that the sorter can

use memory-mapped I/O.

FossilOrigin-Name: 3db78d6100a1ecf58c18eec3abefa7d1250c649c

diff --git a/manifest b/manifest
index bb272d2568d56a0e1a32cf3d12c03ad5bb490365..6127e2a58d5f4f64c76bb80a94641dace5c49509 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\slocal\svariable\sfrom\sthe\sOP_Column\simplementation,\sresulting\sin\sa\nmodest\ssize\sreduction\sand\sa\sperformance\sincrease.
-D 2014-09-19T16:56:45.748
+C Make\sthe\s"nolock"\sVFS\son\sunix\sa\sversion-3\sVFS\sso\sthat\sthe\ssorter\scan\nuse\smemory-mapped\sI/O.
+D 2014-09-19T19:00:48.687
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -211,7 +211,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c addd023b26c623fec4dedc110fc4370a65b4768c
+F src/os_unix.c 9096a1b1449182e67e759f59994eee04113bc587
 F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 F src/pager.c caab007743821d96752597c9cfd7351654697b06
@@ -1198,7 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 24cd32d681df58f687b2afbe4b13d579e3efdd4b
-R dfacf0845df6af56f07b0acf2e71dc1f
+P 6199760d1340858d97c845177986b783da915d9e
+R 747bc9b4978b6e3fd1fc3d52243dfaf2
 U drh
-Z 845eafc57b4e53556b2c7ee6a79ebdad
+Z 26fea32b6bd594b310d5a7de197ed86f

diff --git a/manifest.uuid b/manifest.uuid
index 67c66e8f0f99828a4281f55acaea0affd4c21e8b..146b5e3eb7318d2f3a70856176bee8f5625b6a3c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6199760d1340858d97c845177986b783da915d9e
\ No newline at end of file
+3db78d6100a1ecf58c18eec3abefa7d1250c649c
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 5e820260a46f3ca8aadf5c9824a36b9bd28ebe62..fcd9e72d06e25485569853202416199320cb89c4 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4997,7 +4997,7 @@ IOMETHODS(
 IOMETHODS(
   nolockIoFinder,           /* Finder function name */
   nolockIoMethods,          /* sqlite3_io_methods object name */
-  1,                        /* shared memory is disabled */
+  3,                        /* shared memory is disabled */
   nolockClose,              /* xClose method */
   nolockLock,               /* xLock method */
   nolockUnlock,             /* xUnlock method */