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

Remove a test from sqlite3PagerCommitPhaseOne which is now always true

Browse Source 
after the multi-file transaction fix.

FossilOrigin-Name: 6758f6a8ec97941e09847b309812b3194eb57f19
This commit is contained in:
drh
2010-07-30 16:44:29 +00:00
parent 1e01cf1b84
commit 1e8ed64ed0
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Changes\sto\sthe\scomments\sdescribing\sthe\sPager.setMaster\svariable\sin\spager.c.\sAdd\san\sassert()\sstatement\sto\sverify\sthat\stwo\smaster\sjournal\spointers\sare\snot\swritten\sto\sa\ssingle\sjournal\sfile. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-07-30T11:31:13 Hash: SHA1
C Remove\sa\stest\sfrom\ssqlite3PagerCommitPhaseOne\swhich\sis\snow\salways\strue\nafter\sthe\smulti-file\stransaction\sfix.
D 2010-07-30T16:44:30
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +159,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c 3109e0e5a0d5551bab2e8c7322b20a3b8b171248 F src/os_unix.c 3109e0e5a0d5551bab2e8c7322b20a3b8b171248
F src/os_win.c 1f8b0a1a5bcf6289e7754d0d3c16cec16d4c93ab F src/os_win.c 1f8b0a1a5bcf6289e7754d0d3c16cec16d4c93ab
F src/pager.c 3f2373792cb5c23043cef31878a13b37b0ade1f6 F src/pager.c 202e3dcb3f36c858d4339c0f6fa3d04d67258127
F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5 F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -840,7 +843,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 40f7f0a583e6bba66cd006253a0ef4623ea74f17 P ad78ccacb00e2f8a5ca93e2c9006266d9477fe48
R 9a1109c31f7ded9ef1e129e63eeacbd6 R ab9c5083b94a38201583f7f7d962aec2
U dan U drh
Z 55381d586c03f9b763a259356223e4c4 Z 731cac3ef7411b3c0b31c9abc868e228
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMUwFzoxKgR168RlERAs0AAJ4r8+wS17WmbvJdavU0h3g2I0y8FwCfRtkq
kzxM3lMJD9/oWhUWCEVKnVw=
=ua+E
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
ad78ccacb00e2f8a5ca93e2c9006266d9477fe48 6758f6a8ec97941e09847b309812b3194eb57f19

4
src/pager.c
View File

@@ -1082,7 +1082,6 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){
u32 cksum = 0; /* Checksum of string zMaster */ u32 cksum = 0; /* Checksum of string zMaster */
assert( pPager->setMaster==0 ); assert( pPager->setMaster==0 );
if( !zMaster if( !zMaster
|| pPager->journalMode==PAGER_JOURNALMODE_MEMORY || pPager->journalMode==PAGER_JOURNALMODE_MEMORY
|| pPager->journalMode==PAGER_JOURNALMODE_OFF || pPager->journalMode==PAGER_JOURNALMODE_OFF
@@ -5139,7 +5138,7 @@ int sqlite3PagerCommitPhaseOne(
** backup in progress needs to be restarted. ** backup in progress needs to be restarted.
*/ */
sqlite3BackupRestart(pPager->pBackup); sqlite3BackupRestart(pPager->pBackup);
}else if( pPager->state!=PAGER_SYNCED && pPager->dbModified ){ }else if( pPager->dbModified ){
if( pagerUseWal(pPager) ){ if( pagerUseWal(pPager) ){
PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache); PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache);
if( pList ){ if( pList ){
@@ -5277,6 +5276,7 @@ int sqlite3PagerCommitPhaseOne(
IOTRACE(("DBSYNC %p\n", pPager)) IOTRACE(("DBSYNC %p\n", pPager))
} }
assert( pPager->state!=PAGER_SYNCED );
pPager->state = PAGER_SYNCED; pPager->state = PAGER_SYNCED;
} }