database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Disable shared memory operations using the unix-nolock VFS.

Browse Source 
FossilOrigin-Name: 10a6e510497b471d67ac3dfb19ff256a7d18adf4
This commit is contained in:
drh
2014-09-22 03:22:27 +00:00
parent 6656630b63
commit d9f9441d7d
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifest
View File

@@ -1,5 +1,5 @@
C Correctly\shandle\san\sORDER\sBY\sclause\son\san\souter\squery\swhen\sapplying\nthe\scompound-subquery\sflattening\soptimization.\s\sTicket\s[89398880bcfff].\nAlso\sadd\sthe\sSQLITE_ENABLE_SELECTTRACE\soption\sfor\sadditional\sdebugging\nand\sanalysis\sinformation\sabout\sselect\sstatement\sprocessing. C Disable\sshared\smemory\soperations\susing\sthe\sunix-nolock\sVFS.
D 2014-09-21T22:31:52.593 D 2014-09-22T03:22:27.824
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -212,7 +212,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c 9096a1b1449182e67e759f59994eee04113bc587 F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7 F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
F src/pager.c caab007743821d96752597c9cfd7351654697b06 F src/pager.c caab007743821d96752597c9cfd7351654697b06
@@ -1199,8 +1199,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 59e2c9df02d7e988c5ad44c560ead1e5288b12e7 9683e001ed38b41979220eef0bdfcb54df5f3191 P d5880abd63c83c88e135257373afa0a3fd88297e
R df45958fe8f93552efb788581c98f0f7 R 78a2249f9b04bb5d20ea2c24b3aed300
T +closed 9683e001ed38b41979220eef0bdfcb54df5f3191
U drh U drh
Z d861c46be738b6f104b52fa4441ce204 Z 8d87b3613ef02056468b7e3fc8779d9f

2
manifest.uuid
View File

@@ -1 +1 @@
d5880abd63c83c88e135257373afa0a3fd88297e 10a6e510497b471d67ac3dfb19ff256a7d18adf4

28
src/os_unix.c
View File

@@ -4951,7 +4951,7 @@ static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
** * An I/O method finder function called FINDER that returns a pointer ** * An I/O method finder function called FINDER that returns a pointer
** to the METHOD object in the previous bullet. ** to the METHOD object in the previous bullet.
*/ */
#define IOMETHODS(FINDER, METHOD, VERSION, CLOSE, LOCK, UNLOCK, CKLOCK) \ #define IOMETHODS(FINDER, METHOD, VERSION, CLOSE, LOCK, UNLOCK, CKLOCK, SHMMAP) \
static const sqlite3_io_methods METHOD = { \ static const sqlite3_io_methods METHOD = { \
VERSION, /* iVersion */ \ VERSION, /* iVersion */ \
CLOSE, /* xClose */ \ CLOSE, /* xClose */ \
@@ -4966,7 +4966,7 @@ static const sqlite3_io_methods METHOD = { \
unixFileControl, /* xFileControl */ \ unixFileControl, /* xFileControl */ \
unixSectorSize, /* xSectorSize */ \ unixSectorSize, /* xSectorSize */ \
unixDeviceCharacteristics, /* xDeviceCapabilities */ \ unixDeviceCharacteristics, /* xDeviceCapabilities */ \
unixShmMap, /* xShmMap */ \ SHMMAP, /* xShmMap */ \
unixShmLock, /* xShmLock */ \ unixShmLock, /* xShmLock */ \
unixShmBarrier, /* xShmBarrier */ \ unixShmBarrier, /* xShmBarrier */ \
unixShmUnmap, /* xShmUnmap */ \ unixShmUnmap, /* xShmUnmap */ \
@@ -4992,7 +4992,8 @@ IOMETHODS(
unixClose, /* xClose method */ unixClose, /* xClose method */
unixLock, /* xLock method */ unixLock, /* xLock method */
unixUnlock, /* xUnlock method */ unixUnlock, /* xUnlock method */
unixCheckReservedLock /* xCheckReservedLock method */ unixCheckReservedLock, /* xCheckReservedLock method */
unixShmMap /* xShmMap method */
) )
IOMETHODS( IOMETHODS(
nolockIoFinder, /* Finder function name */ nolockIoFinder, /* Finder function name */
@@ -5001,7 +5002,8 @@ IOMETHODS(
nolockClose, /* xClose method */ nolockClose, /* xClose method */
nolockLock, /* xLock method */ nolockLock, /* xLock method */
nolockUnlock, /* xUnlock method */ nolockUnlock, /* xUnlock method */
nolockCheckReservedLock /* xCheckReservedLock method */ nolockCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
IOMETHODS( IOMETHODS(
dotlockIoFinder, /* Finder function name */ dotlockIoFinder, /* Finder function name */
@@ -5010,7 +5012,8 @@ IOMETHODS(
dotlockClose, /* xClose method */ dotlockClose, /* xClose method */
dotlockLock, /* xLock method */ dotlockLock, /* xLock method */
dotlockUnlock, /* xUnlock method */ dotlockUnlock, /* xUnlock method */
dotlockCheckReservedLock /* xCheckReservedLock method */ dotlockCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS #if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
@@ -5021,7 +5024,8 @@ IOMETHODS(
flockClose, /* xClose method */ flockClose, /* xClose method */
flockLock, /* xLock method */ flockLock, /* xLock method */
flockUnlock, /* xUnlock method */ flockUnlock, /* xUnlock method */
flockCheckReservedLock /* xCheckReservedLock method */ flockCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#endif #endif
@@ -5033,7 +5037,8 @@ IOMETHODS(
semClose, /* xClose method */ semClose, /* xClose method */
semLock, /* xLock method */ semLock, /* xLock method */
semUnlock, /* xUnlock method */ semUnlock, /* xUnlock method */
semCheckReservedLock /* xCheckReservedLock method */ semCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#endif #endif
@@ -5045,7 +5050,8 @@ IOMETHODS(
afpClose, /* xClose method */ afpClose, /* xClose method */
afpLock, /* xLock method */ afpLock, /* xLock method */
afpUnlock, /* xUnlock method */ afpUnlock, /* xUnlock method */
afpCheckReservedLock /* xCheckReservedLock method */ afpCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#endif #endif
@@ -5070,7 +5076,8 @@ IOMETHODS(
proxyClose, /* xClose method */ proxyClose, /* xClose method */
proxyLock, /* xLock method */ proxyLock, /* xLock method */
proxyUnlock, /* xUnlock method */ proxyUnlock, /* xUnlock method */
proxyCheckReservedLock /* xCheckReservedLock method */ proxyCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#endif #endif
@@ -5083,7 +5090,8 @@ IOMETHODS(
unixClose, /* xClose method */ unixClose, /* xClose method */
unixLock, /* xLock method */ unixLock, /* xLock method */
nfsUnlock, /* xUnlock method */ nfsUnlock, /* xUnlock method */
unixCheckReservedLock /* xCheckReservedLock method */ unixCheckReservedLock, /* xCheckReservedLock method */
0 /* xShmMap method */
) )
#endif #endif