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 asserts on the existing of journal files in pager - asserts that

Browse Source 
are not valid for certain kinds of simulated I/O errors or for async I/O. (CVS 3769)

FossilOrigin-Name: f5fad52a97a16faddc2701ea0e05a301974eda1a
This commit is contained in:
drh
2007-03-30 17:18:50 +00:00
parent a817e42a21
commit 1abd422d99
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Get\sthe\smemleak.test\sscript\sworking\sagain\safter\srecent\schanges.\s(CVS\s3768) C Remove\sasserts\son\sthe\sexisting\sof\sjournal\sfiles\sin\spager\s-\sasserts\sthat\nare\snot\svalid\sfor\scertain\skinds\sof\ssimulated\sI/O\serrors\sor\sfor\sasync\sI/O.\s(CVS\s3769)
D 2007-03-30T17:17:52 D 2007-03-30T17:18:51
F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -86,7 +86,7 @@ F src/os_unix.c 4291be23eec73d1ec04010ae702364b781b5f773
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c c3a8403ea28bbb89d6507fa984c5919bd3fe7539 F src/os_win.c c3a8403ea28bbb89d6507fa984c5919bd3fe7539
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c ae0b1e1ae9b3f7fc725b6c92cf10f2a582006e44 F src/pager.c 15118c2b519e4969e77d356b9d4ed6ca5839b196
F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42 F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42
F src/parse.y 207ab04273ae13aa4a729b96008d294d5f334ab3 F src/parse.y 207ab04273ae13aa4a729b96008d294d5f334ab3
F src/pragma.c 3b992b5b2640d6ae25cef05aa6a42cd1d6c43234 F src/pragma.c 3b992b5b2640d6ae25cef05aa6a42cd1d6c43234
@@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P eec7ab63beed875a3b16c3bf8d28ac4f296dfb4c P cd6ca078e3402f06836b6b510a4a431f576f7219
R 7c4f002397ad2bb1c06d129d7feeb9c6 R a1829a1a4c7480d97a0c0b316a97e2e2
U drh U drh
Z 9b2c2a4a18f2bf41f94905f4fed8d942 Z 8885ea3dc8b09d44dda50207da9f7451

2
manifest.uuid
View File

@@ -1 +1 @@
cd6ca078e3402f06836b6b510a4a431f576f7219 f5fad52a97a16faddc2701ea0e05a301974eda1a

9
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.309 2007/03/30 16:01:55 drh Exp $ ** @(#) $Id: pager.c,v 1.310 2007/03/30 17:18:51 drh Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -956,9 +956,12 @@ static int pager_end_transaction(Pager *pPager){
** be in the file system. This pager still holds a RESERVED or greater ** be in the file system. This pager still holds a RESERVED or greater
** lock on the database file, so there is no chance another process ** lock on the database file, so there is no chance another process
** could create or remove a journal file. ** could create or remove a journal file.
**
** These asserts are not valid for asynchronous I/O such as is found
** in async.test
*/ */
assert( sqlite3OsFileExists(pPager->zJournal) || pPager->tempFile ); /*assert( sqlite3OsFileExists(pPager->zJournal) || pPager->tempFile );*/
assert( !sqlite3OsFileExists(pPager->zJournal) || !pPager->tempFile ); /*assert( !sqlite3OsFileExists(pPager->zJournal) || !pPager->tempFile );*/
if( !pPager->tempFile ){ if( !pPager->tempFile ){
rc = sqlite3OsDelete(pPager->zJournal); rc = sqlite3OsDelete(pPager->zJournal);
} }