database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Ignore malloc failures within the WAL file truncation attempt for

Browse Source 
journal_size_limit.

FossilOrigin-Name: dd19105aa9521ffc0edcf16b84c064d5ebad55d7
This commit is contained in:
drh
2011-05-25 20:25:10 +00:00
parent 2cac2078f6
commit ef05c39d12
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\scase\swhere\sa\smalloc()\serror\scould\slead\sto\smismatched\svirtual-table\sxBegin/xCommit/xRollback\scallbacks. C Ignore\smalloc\sfailures\swithin\sthe\sWAL\sfile\struncation\sattempt\sfor\njournal_size_limit.
D 2011-05-25T18:46:22.024 D 2011-05-25T20:25:10.559
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -245,7 +245,7 @@ F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
F src/vtab.c 9ba8c7fdb7d39260c033a402f6032d3e7bc5d336 F src/vtab.c 9ba8c7fdb7d39260c033a402f6032d3e7bc5d336
F src/wal.c de27c34c8016c00be348fc6bed588816557ceb66 F src/wal.c ab1d8c5abf904fd6396f90499cbd8c54b8d6961b
F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5 F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5
@@ -938,7 +938,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 6df99e52dabf2a243ad635529649b86c21735e91 P d807304a695fc85402b86e1cd32a6e3bbb2823c8
R 02c26b8fd230a540c57276590c974e79 R 40f4c0754c95b7a51c08aa03886ff26c
U dan U drh
Z e2a23225f8e5abceac6a8fe1d14982ec Z c74bad4333e073e26c4db5e166f8f584

2
manifest.uuid
View File

@@ -1 +1 @@
d807304a695fc85402b86e1cd32a6e3bbb2823c8 dd19105aa9521ffc0edcf16b84c064d5ebad55d7

2
src/wal.c
View File

@@ -2539,10 +2539,12 @@ static int walRestartLog(Wal *pWal){
if( pWal->mxWalSize>=0 ){ if( pWal->mxWalSize>=0 ){
i64 sz; i64 sz;
int rx; int rx;
sqlite3BeginBenignMalloc();
rx = sqlite3OsFileSize(pWal->pWalFd, &sz); rx = sqlite3OsFileSize(pWal->pWalFd, &sz);
if( rx==SQLITE_OK && (sz > pWal->mxWalSize) ){ if( rx==SQLITE_OK && (sz > pWal->mxWalSize) ){
rx = sqlite3OsTruncate(pWal->pWalFd, pWal->mxWalSize); rx = sqlite3OsTruncate(pWal->pWalFd, pWal->mxWalSize);
} }
sqlite3EndBenignMalloc();
if( rx ){ if( rx ){
sqlite3_log(rx, "cannot limit WAL size: %s", pWal->zWalName); sqlite3_log(rx, "cannot limit WAL size: %s", pWal->zWalName);
} }