SQLite: Check-in [158a3097]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	In WAL mode, ignore any error returned by an xFileControl(FCNTL_SIZE_HINT) call. This matches the behaviour in rollback mode.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| experimental
Files:	files \| file ages \| folders
SHA1:	158a309737bd4cdc033cd504a6d0cc43c15b6e17
User & Date:	dan 2010-08-09 07:07:38

Context

2010-08-09
07:51		Fix a problem causing the return code of an xSync call to be ignored in wal.c. check-in: f1b2b5f9 user: dan tags: experimental
07:07		In WAL mode, ignore any error returned by an xFileControl(FCNTL_SIZE_HINT) call. This matches the behaviour in rollback mode. check-in: 158a3097 user: dan tags: experimental
2010-08-07
16:17		Fix minor problems and update comments in pager.c. check-in: 92e45637 user: dan tags: experimental

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/wal.c.

  1578   1578   
  1579   1579       /* If the database file may grow as a result of this checkpoint, hint
  1580   1580       ** about the eventual size of the db file to the VFS layer. 
  1581   1581       */
  1582   1582       nReq = ((i64)mxPage * szPage);
  1583   1583       rc = sqlite3OsFileSize(pWal->pDbFd, &nSize);
  1584   1584       if( rc==SQLITE_OK && nSize<nReq ){
  1585         -      rc = sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_SIZE_HINT, &nReq);
         1585  +      sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_SIZE_HINT, &nReq);
  1586   1586       }
  1587   1587   
  1588   1588       /* Iterate through the contents of the WAL, copying data to the db file. */
  1589   1589       while( rc==SQLITE_OK && 0==walIteratorNext(pIter, &iDbpage, &iFrame) ){
  1590   1590         i64 iOffset;
  1591   1591         assert( walFramePgno(pWal, iFrame)==iDbpage );
  1592   1592         if( iFrame<=nBackfill || iFrame>mxSafeFrame || iDbpage>mxPage ) continue;