Reduce the number of paths in btreeCopyFile(). (CVS 6124)
FossilOrigin-Name: df2c285cb99ac188c96dd1a4e6a30f689195a150
This commit is contained in:
danielk1977
parent
cd1cbff38b
commit
076dce5336
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Modify\stest_journal.c\sto\sverify\sthe\spage\sdata\sbeing\swritten\sto\sthe\sjournal\sfile.\s(CVS\s6123)
|
||||
D 2009-01-06T17:52:44
|
||||
C Reduce\sthe\snumber\sof\spaths\sin\sbtreeCopyFile().\s(CVS\s6124)
|
||||
D 2009-01-06T18:21:09
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -103,7 +103,7 @@ F src/attach.c 1c35f95da3c62d19de75b44cfefd12c81c1791b3
|
||||
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
|
||||
F src/bitvec.c a97d315fc7c0ec54fabd8859a45bd4e8e0d16b0b
|
||||
F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a
|
||||
F src/btree.c b0cf3e7273ba20fe280fc7c889f972419562076d
|
||||
F src/btree.c 8f5a2e9aae567ddf24976c708ac3cdb0b6e61b31
|
||||
F src/btree.h 4f141cf748d2ee7c6d7fc175f64f87a45cd44113
|
||||
F src/btreeInt.h 8fea5cd7021cb8848fc2183a3e909469659daa0a
|
||||
F src/build.c 6eb9d20e99db8da8c7c6e7316096a6ff3d9acab9
|
||||
@ -692,7 +692,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P ee7b4b60880e80e6fb0b2f93ebc6ee5ad6917f9d
|
||||
R df239d0a18ce55c45df67f391c4292ac
|
||||
P 0d258956f8971c0af7853b836a7d6e7f3a800c37
|
||||
R 05e05e438c10e4adf18b22c74b0a0660
|
||||
U danielk1977
|
||||
Z 2c4d14960713eb79bb3320ac4beeb7d8
|
||||
Z 41f6943cd36d80f336d0d71bac27acbf
|
||||
|
||||
@ -1 +1 @@
|
||||
0d258956f8971c0af7853b836a7d6e7f3a800c37
|
||||
df2c285cb99ac188c96dd1a4e6a30f689195a150
|
||||
120
src/btree.c
120
src/btree.c
@ -9,7 +9,7 @@
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: btree.c,v 1.555 2009/01/02 21:08:09 drh Exp $
|
||||
** $Id: btree.c,v 1.556 2009/01/06 18:21:09 danielk1977 Exp $
|
||||
**
|
||||
** This file implements a external (disk-based) database using BTrees.
|
||||
** See the header comment on "btreeInt.h" for additional information.
|
||||
@ -7290,76 +7290,70 @@ static int btreeCopyFile(Btree *pTo, Btree *pFrom){
|
||||
** bytes and 9 pages, then the file needs to be truncated to 9KB.
|
||||
*/
|
||||
if( rc==SQLITE_OK ){
|
||||
if( nFromPageSize!=nToPageSize ){
|
||||
sqlite3_file *pFile = sqlite3PagerFile(pBtTo->pPager);
|
||||
i64 iSize = (i64)nFromPageSize * (i64)nFromPage;
|
||||
i64 iNow = (i64)((nToPage>nNewPage)?nToPage:nNewPage) * (i64)nToPageSize;
|
||||
i64 iPending = ((i64)PENDING_BYTE_PAGE(pBtTo)-1) *(i64)nToPageSize;
|
||||
|
||||
assert( iSize<=iNow );
|
||||
|
||||
/* Commit phase one syncs the journal file associated with pTo
|
||||
** containing the original data. It does not sync the database file
|
||||
** itself. After doing this it is safe to use OsTruncate() and other
|
||||
** file APIs on the database file directly.
|
||||
*/
|
||||
pBtTo->db = pTo->db;
|
||||
rc = sqlite3PagerCommitPhaseOne(pBtTo->pPager, 0, 1);
|
||||
if( iSize<iNow && rc==SQLITE_OK ){
|
||||
rc = sqlite3OsTruncate(pFile, iSize);
|
||||
}
|
||||
|
||||
/* The loop that copied data from database pFrom to pTo did not
|
||||
** populate the locking page of database pTo. If the page-size of
|
||||
** pFrom is smaller than that of pTo, this means some data will
|
||||
** not have been copied.
|
||||
**
|
||||
** This block copies the missing data from database pFrom to pTo
|
||||
** using file APIs. This is safe because at this point we know that
|
||||
** all of the original data from pTo has been synced into the
|
||||
** journal file. At this point it would be safe to do anything at
|
||||
** all to the database file except truncate it to zero bytes.
|
||||
*/
|
||||
if( rc==SQLITE_OK && nFromPageSize<nToPageSize && iSize>iPending){
|
||||
i64 iOff;
|
||||
for(
|
||||
iOff=iPending;
|
||||
rc==SQLITE_OK && iOff<(iPending+nToPageSize);
|
||||
iOff += nFromPageSize
|
||||
){
|
||||
DbPage *pFromPage = 0;
|
||||
Pgno iFrom = (Pgno)(iOff/nFromPageSize)+1;
|
||||
|
||||
if( iFrom==PENDING_BYTE_PAGE(pBtFrom) || iFrom>nFromPage ){
|
||||
continue;
|
||||
}
|
||||
|
||||
rc = sqlite3PagerGet(pBtFrom->pPager, iFrom, &pFromPage);
|
||||
if( rc==SQLITE_OK ){
|
||||
char *zFrom = sqlite3PagerGetData(pFromPage);
|
||||
rc = sqlite3OsWrite(pFile, zFrom, nFromPageSize, iOff);
|
||||
sqlite3PagerUnref(pFromPage);
|
||||
}
|
||||
sqlite3_file *pFile = sqlite3PagerFile(pBtTo->pPager);
|
||||
i64 iSize = (i64)nFromPageSize * (i64)nFromPage;
|
||||
i64 iNow = (i64)((nToPage>nNewPage)?nToPage:nNewPage) * (i64)nToPageSize;
|
||||
i64 iPending = ((i64)PENDING_BYTE_PAGE(pBtTo)-1) *(i64)nToPageSize;
|
||||
|
||||
assert( iSize<=iNow );
|
||||
|
||||
/* Commit phase one syncs the journal file associated with pTo
|
||||
** containing the original data. It does not sync the database file
|
||||
** itself. After doing this it is safe to use OsTruncate() and other
|
||||
** file APIs on the database file directly.
|
||||
*/
|
||||
pBtTo->db = pTo->db;
|
||||
rc = sqlite3PagerCommitPhaseOne(pBtTo->pPager, 0, 1);
|
||||
if( iSize<iNow && rc==SQLITE_OK ){
|
||||
rc = sqlite3OsTruncate(pFile, iSize);
|
||||
}
|
||||
|
||||
/* The loop that copied data from database pFrom to pTo did not
|
||||
** populate the locking page of database pTo. If the page-size of
|
||||
** pFrom is smaller than that of pTo, this means some data will
|
||||
** not have been copied.
|
||||
**
|
||||
** This block copies the missing data from database pFrom to pTo
|
||||
** using file APIs. This is safe because at this point we know that
|
||||
** all of the original data from pTo has been synced into the
|
||||
** journal file. At this point it would be safe to do anything at
|
||||
** all to the database file except truncate it to zero bytes.
|
||||
*/
|
||||
if( rc==SQLITE_OK && nFromPageSize<nToPageSize && iSize>iPending){
|
||||
i64 iOff;
|
||||
for(
|
||||
iOff=iPending;
|
||||
rc==SQLITE_OK && iOff<(iPending+nToPageSize);
|
||||
iOff += nFromPageSize
|
||||
){
|
||||
DbPage *pFromPage = 0;
|
||||
Pgno iFrom = (Pgno)(iOff/nFromPageSize)+1;
|
||||
|
||||
if( iFrom==PENDING_BYTE_PAGE(pBtFrom) || iFrom>nFromPage ){
|
||||
continue;
|
||||
}
|
||||
|
||||
rc = sqlite3PagerGet(pBtFrom->pPager, iFrom, &pFromPage);
|
||||
if( rc==SQLITE_OK ){
|
||||
char *zFrom = sqlite3PagerGetData(pFromPage);
|
||||
rc = sqlite3OsWrite(pFile, zFrom, nFromPageSize, iOff);
|
||||
sqlite3PagerUnref(pFromPage);
|
||||
}
|
||||
}
|
||||
|
||||
/* Sync the database file */
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3PagerSync(pBtTo->pPager);
|
||||
}
|
||||
}else{
|
||||
rc = sqlite3PagerTruncate(pBtTo->pPager, nNewPage);
|
||||
}
|
||||
if( rc==SQLITE_OK ){
|
||||
pBtTo->pageSizeFixed = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if( rc ){
|
||||
/* Sync the database file */
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3PagerSync(pBtTo->pPager);
|
||||
}
|
||||
if( rc==SQLITE_OK ){
|
||||
pBtTo->pageSizeFixed = 0;
|
||||
}else{
|
||||
sqlite3BtreeRollback(pTo);
|
||||
}
|
||||
|
||||
return rc;
|
||||
return rc;
|
||||
}
|
||||
int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
|
||||
int rc;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user