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

Improve testing of the wal.c changes on this branch.

Browse Source 
FossilOrigin-Name: 63483e22c775183e01924b5cb3d0f3655b63c3cdd06faf26cacd4d0913c0055c
This commit is contained in:
dan
2018-12-26 20:42:32 +00:00
parent 2d111c8bbb
commit 0f297b6e50
6 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wal.c
View File

@@ -576,7 +576,7 @@ struct WalIndexHdr {
** void walidxSetFile(WalIndexHdr*, int val); // set file
*/
#define walidxGetMxFrame(pHdr, iWal) \
((iWal) ? ((pHdr)->mxFrame2 & 0x7FFFFFF) : (pHdr)->mxFrame)
((iWal) ? ((pHdr)->mxFrame2 & 0x7FFFFFFF) : (pHdr)->mxFrame)
static void walidxSetMxFrame(WalIndexHdr *pHdr, int iWal, u32 mxFrame){
if( iWal ){
@@ -4427,10 +4427,9 @@ int sqlite3WalCheckpoint(
/* Copy data from the log to the database file. */
if( rc==SQLITE_OK ){
int iCkpt = walidxGetFile(&pWal->hdr);
if( (walPagesize(pWal)!=nBuf)
&& (walidxGetMxFrame(&pWal->hdr, 0) || walidxGetMxFrame(&pWal->hdr, 1))
){
if( (walPagesize(pWal)!=nBuf) && walidxGetMxFrame(&pWal->hdr, iCkpt) ){
rc = SQLITE_CORRUPT_BKPT;
}else{
rc = walCheckpoint(pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf);
@@ -4444,7 +4443,7 @@ int sqlite3WalCheckpoint(
if( pnCkpt ){
if( isWalMode2(pWal) ){
if( (int)(walCkptInfo(pWal)->nBackfill) ){
*pnCkpt = walidxGetMxFrame(&pWal->hdr, !walidxGetFile(&pWal->hdr));
*pnCkpt = walidxGetMxFrame(&pWal->hdr, iCkpt);
}else{
*pnCkpt = 0;
}