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

Fix some edge cases with backing up databases that are exactly PENDING_BYTE bytes in size, or just slightly larger. (CVS 6288)

Browse Source 
FossilOrigin-Name: 2fc450e8e60248d6111d0b0d2b8f2344f5b89bca
This commit is contained in:
danielk1977
2009-02-12 17:01:49 +00:00
parent 1435ccd52b
commit f2a79f2248
5 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backup.c
View File

@@ -12,7 +12,7 @@
** This file contains the implementation of the sqlite3_backup_XXX()
** API functions and the related features.
**
** $Id: backup.c,v 1.9 2009/02/09 18:55:46 danielk1977 Exp $
** $Id: backup.c,v 1.10 2009/02/12 17:01:50 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "btreeInt.h"
@@ -373,6 +373,9 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
if( nSrcPagesize<nDestPagesize ){
int ratio = nDestPagesize/nSrcPagesize;
nDestTruncate = (nSrcPage+ratio-1)/ratio;
if( nDestTruncate==PENDING_BYTE_PAGE(p->pDest->pBt) ){
nDestTruncate--;
}
}else{
nDestTruncate = nSrcPage * (nSrcPagesize/nDestPagesize);
}
@@ -392,7 +395,10 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
sqlite3_file * const pFile = sqlite3PagerFile(pDestPager);
assert( pFile );
assert( (i64)nDestTruncate*(i64)nDestPagesize >= iSize );
assert( (i64)nDestTruncate*(i64)nDestPagesize >= iSize || (
nDestTruncate==(PENDING_BYTE_PAGE(p->pDest->pBt)-1)
&& iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+nDestPagesize
));
if( SQLITE_OK==(rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1))
&& SQLITE_OK==(rc = backupTruncateFile(pFile, iSize))
&& SQLITE_OK==(rc = sqlite3PagerSync(pDestPager))