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

Add tests to insure VACUUM works in the presence of I/O errors. Fix some

Browse Source 
problems that came to light by these tests. (CVS 935)

FossilOrigin-Name: 8d3e879349fc9523c72cb46111e0058b57ce9341
This commit is contained in:
drh
2003-04-25 15:37:57 +00:00
parent 9c05dc6298
commit 2e6d11bc07
7 changed files with 128 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.91 2003/04/25 13:22:52 drh Exp $
** $Id: btree.c,v 1.92 2003/04/25 15:37:58 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -3498,22 +3498,34 @@ static const char *fileBtreeGetFilename(Btree *pBt){
*/
static int fileBtreeCopyFile(Btree *pBtTo, Btree *pBtFrom){
int rc = SQLITE_OK;
Pgno i, nPage;
Pgno i, nPage, nToPage;
if( !pBtTo->inTrans || !pBtFrom->inTrans ) return SQLITE_ERROR;
if( pBtTo->needSwab!=pBtFrom->needSwab ) return SQLITE_ERROR;
if( pBtTo->pCursor ) return SQLITE_BUSY;
memcpy(pBtTo->page1, pBtFrom->page1, SQLITE_PAGE_SIZE);
sqlitepager_overwrite(pBtTo->pPager, 1, pBtFrom->page1);
rc = sqlitepager_overwrite(pBtTo->pPager, 1, pBtFrom->page1);
nToPage = sqlitepager_pagecount(pBtTo->pPager);
nPage = sqlitepager_pagecount(pBtFrom->pPager);
for(i=2; i<=nPage; i++){
for(i=2; rc==SQLITE_OK && i<=nPage; i++){
void *pPage;
rc = sqlitepager_get(pBtFrom->pPager, i, &pPage);
if( rc ) break;
sqlitepager_overwrite(pBtTo->pPager, i, pPage);
rc = sqlitepager_overwrite(pBtTo->pPager, i, pPage);
if( rc ) break;
sqlitepager_unref(pPage);
}
if( !rc ) rc = sqlitepager_truncate(pBtTo->pPager, nPage);
for(i=nPage+1; rc==SQLITE_OK && i<=nToPage; i++){
void *pPage;
rc = sqlitepager_get(pBtTo->pPager, i, &pPage);
if( rc ) break;
rc = sqlitepager_write(pPage);
sqlitepager_unref(pPage);
sqlitepager_dont_write(pBtTo->pPager, i);
}
if( !rc && nPage<nToPage ){
rc = sqlitepager_truncate(pBtTo->pPager, nPage);
}
if( rc ){
fileBtreeRollback(pBtTo);
}