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

Remove unreachable code associated with WAL from the pager.

Browse Source 
FossilOrigin-Name: 54c1718e6d15a20414cae15895eb5e83217722e2
This commit is contained in:
drh
2010-05-25 02:24:01 +00:00
parent f53303573a
commit 82043b3077
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C OOM\serrors\sduring\san\sauto-checkpoint\sare\sbenign. C Remove\sunreachable\scode\sassociated\swith\sWAL\sfrom\sthe\spager.
D 2010-05-24T20:27:44 D 2010-05-25T02:24:01
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -157,7 +157,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
F src/os_unix.c 35ace483789db8ede92acc46134930c2c4267645 F src/os_unix.c 35ace483789db8ede92acc46134930c2c4267645
F src/os_win.c 1e44ee84210b59db1e098bbbc66f6dee68e20d5f F src/os_win.c 1e44ee84210b59db1e098bbbc66f6dee68e20d5f
F src/pager.c 0fbfe2ccd98cd893f3b5254a9297e153440e5e37 F src/pager.c 5d693cc6273c5406a21f1a2afa18309457273549
F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0 F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0
F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
@@ -817,14 +817,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 27ba9c21fb591190b73010ced394cc62c1edff54 P 3d252ce5d0d843e4e65beed672598e65c5745129
R 3195c6c6b7b2983748f5a54772528c4d R ac14f5ddc7bfde994fc5d9b9840c3b63
U drh U drh
Z 3bc713b958a241bcdc7c302c193ca83a Z cf8997a16115d390b555f7bd6076c97d
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL+uFDoxKgR168RlERAkYQAKCH/eoffbdqZTBhYb3dIvMptV/aiQCgixZm iD8DBQFL+zTEoxKgR168RlERAggGAJwON3XhIyWJUiH+/N6YqZBaIRwrXQCbBrgM
mwEmqvNEPgCoaWCLa1ms7Jg= la8oM5lf1RPWOhEYr/CldiE=
=DlGb =tulc
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
3d252ce5d0d843e4e65beed672598e65c5745129 54c1718e6d15a20414cae15895eb5e83217722e2

24
src/pager.c
View File

@@ -2392,18 +2392,15 @@ static int pagerOpenSnapshot(Pager *pPager){
*/ */
static int pagerHasWAL(Pager *pPager, int *pExists){ static int pagerHasWAL(Pager *pPager, int *pExists){
int rc; /* Return code */ int rc; /* Return code */
char *zWal; /* Name of the WAL file */
if( !pPager->tempFile ){ assert( !pPager->tempFile );
char *zWal = sqlite3_mprintf("%s-wal", pPager->zFilename); zWal = sqlite3_mprintf("%s-wal", pPager->zFilename);
if( !zWal ){ if( !zWal ){
rc = SQLITE_NOMEM; rc = SQLITE_NOMEM;
}else{
rc = sqlite3OsAccess(pPager->pVfs, zWal, SQLITE_ACCESS_EXISTS, pExists);
sqlite3_free(zWal);
}
}else{ }else{
rc = SQLITE_OK; rc = sqlite3OsAccess(pPager->pVfs, zWal, SQLITE_ACCESS_EXISTS, pExists);
*pExists = 0; sqlite3_free(zWal);
} }
return rc; return rc;
} }
@@ -2847,6 +2844,12 @@ int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){
memset(pDest, 0, N); memset(pDest, 0, N);
assert( isOpen(pPager->fd) || pPager->tempFile ); assert( isOpen(pPager->fd) || pPager->tempFile );
/* This routine is only called by btree immediately after creating
** the Pager object. There has not been an opportunity to transition
** to WAL mode yet.
*/
assert( !pagerUseWal(pPager) );
#if 0
if( pagerUseWal(pPager) ){ if( pagerUseWal(pPager) ){
int isInWal = 0; int isInWal = 0;
rc = sqlite3WalRead(pPager->pWal, 1, &isInWal, N, pDest); rc = sqlite3WalRead(pPager->pWal, 1, &isInWal, N, pDest);
@@ -2854,6 +2857,7 @@ int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){
return rc; return rc;
} }
} }
#endif
if( isOpen(pPager->fd) ){ if( isOpen(pPager->fd) ){
IOTRACE(("DBHDR %p 0 %d\n", pPager, N)) IOTRACE(("DBHDR %p 0 %d\n", pPager, N))