database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Move function sqlite3PagerClearCache() out of the "ifndef SQLITE_OMIT_WAL" block and into an "ifndef SQLITE_OMIT_VACUUM" block.

Browse Source 
FossilOrigin-Name: 5dbfaed8c3e09ea35033dacf6faa3d6a0202cc68
This commit is contained in:
dan
2011-11-06 05:06:13 +00:00
parent ccdf1baebf
commit f673e09ef5
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Update\sthe\sxfer\soptimization\scode\sso\sthat\sthe\sxfer\soptimization\scan\sbe\sused\nwith\sINTEGER\sPRIMARY\sKEY\sON\sCONFLICT\s...\sas\slong\sas\sthe\sdestination\stable\nis\sinitially\sempty.\s\sImprovements\sto\sthe\scomments\son\sthe\sxfer\soptimization.\nNew\stest\scases\sadded. C Move\sfunction\ssqlite3PagerClearCache()\sout\sof\sthe\s"ifndef\sSQLITE_OMIT_WAL"\sblock\sand\sinto\san\s"ifndef\sSQLITE_OMIT_VACUUM"\sblock.
D 2011-11-04T14:36:02.150 D 2011-11-06T05:06:13.597
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
F src/os_unix.c 32f2ac2adbbba6acb649915a6953524ecf4cf9d5 F src/os_unix.c 32f2ac2adbbba6acb649915a6953524ecf4cf9d5
F src/os_win.c 49d418916428a59d773f39993db0ecde56ab4c37 F src/os_win.c 49d418916428a59d773f39993db0ecde56ab4c37
F src/pager.c ad62daa0c21e27ae332b3ceb4f579a2a97046ddc F src/pager.c db33d4bf1e3e019c34c220971cc6c3aa07c30f54
F src/pager.h 9f81b08efb06db4ba8be69446e10b005c351373d F src/pager.h 9f81b08efb06db4ba8be69446e10b005c351373d
F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
@@ -974,7 +974,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 5e1d247e5b3b5dcf6763f01002e996786db48152 P e3f368cd5ef66a56fd4bd05a77276039e26b9e0e
R 97a1f3cbe9769d6539f852a4f755f4f2 R 5c39124f3d2f2639b32de1100072ae22
U drh U dan
Z c28f9972b18a5ec408f3c191a9ff9538 Z 40b32dc92ad17e089c0e0585e705b0ef

2
manifest.uuid
View File

@@ -1 +1 @@
e3f368cd5ef66a56fd4bd05a77276039e26b9e0e 5dbfaed8c3e09ea35033dacf6faa3d6a0202cc68

16
src/pager.c
View File

@@ -6660,6 +6660,15 @@ sqlite3_backup **sqlite3PagerBackupPtr(Pager *pPager){
return &pPager->pBackup; return &pPager->pBackup;
} }
#ifndef SQLITE_OMIT_VACUUM
/*
** Unless this is an in-memory or temporary database, clear the pager cache.
*/
void sqlite3PagerClearCache(Pager *pPager){
if( !MEMDB && pPager->tempFile==0 ) pager_reset(pPager);
}
#endif
#ifndef SQLITE_OMIT_WAL #ifndef SQLITE_OMIT_WAL
/* /*
** This function is called when the user invokes "PRAGMA wal_checkpoint", ** This function is called when the user invokes "PRAGMA wal_checkpoint",
@@ -6836,13 +6845,6 @@ int sqlite3PagerCloseWal(Pager *pPager){
return rc; return rc;
} }
/*
** Unless this is an in-memory or temporary database, clear the pager cache.
*/
void sqlite3PagerClearCache(Pager *pPager){
if( !MEMDB && pPager->tempFile==0 ) pager_reset(pPager);
}
#ifdef SQLITE_HAS_CODEC #ifdef SQLITE_HAS_CODEC
/* /*
** This function is called by the wal module when writing page content ** This function is called by the wal module when writing page content