database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Use a bitvec object to store the set of pages with the 'always-rollback' property for a transaction. (CVS 5622)

Browse Source 
FossilOrigin-Name: 9e9325997e11a0368721ed7860f4c37de3502a9b
This commit is contained in:
danielk1977
2008-08-27 15:16:33 +00:00
parent e5767a33e5
commit a1fa00d95f
7 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifest
View File

@@ -1,5 +1,5 @@
C Remove\sobsolete\sfile:\smd5.c.\s\sThis\sfile\shad\sbeen\sremoved\syears\sago.\s\sIt\sis\nunclear\show\sit\sgot\sback\sinto\sthe\srepository.\s(CVS\s5621) C Use\sa\sbitvec\sobject\sto\sstore\sthe\sset\sof\spages\swith\sthe\s'always-rollback'\sproperty\sfor\sa\stransaction.\s(CVS\s5622)
D 2008-08-27T13:31:10 D 2008-08-27T15:16:34
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -96,7 +96,7 @@ F src/attach.c db3f4a60538733c1e4dcb9d0217a6e0d6ccd615b
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53 F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
F src/btree.c f6a1f698b1625da624457d25436e1a639631ffb3 F src/btree.c 9b98b0d2e2273998b13a74856d5c62971b35449c
F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107 F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107
F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576 F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
@@ -134,11 +134,11 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
F src/os_unix.c 4665cef7639dd937893c3ea076f0e8a8f215bb32 F src/os_unix.c 4665cef7639dd937893c3ea076f0e8a8f215bb32
F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
F src/pager.c 095efa75a1a6500e6e975d1f7ddad34ed25424ae F src/pager.c a38742815a6b2238d0b91d1dd64bda50d6ee95fc
F src/pager.h 3b9c138d2e744b9d6e61d4c2742301e3bf464864 F src/pager.h 914103bb62dbcc3d8e9f14baec812d027264d457
F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
F src/pcache.c 9e00544dd8c2bc93087050fecad9767353a9b81d F src/pcache.c 94050f68015c883813e39cd222b21d7728ad1203
F src/pcache.h 3531f83e1771442af16f6ffeac68024ff8c8bb2d F src/pcache.h 7a50b77f06c220ff7696be1a9f2a17c9e6ddc486
F src/pragma.c f5b271b090af7fcedd308d7c5807a5503f7a853d F src/pragma.c f5b271b090af7fcedd308d7c5807a5503f7a853d
F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510 F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510
F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 7de32498b349e046c5c886de255bbdefd6a7e8f7 P 45fc70bd9264d5bcd72c97017079ced4aac7729f
R a8e55ba2d18a22da01faf295df6cff77 R c500546293e96bf186a034cac9d9bde9
U drh U danielk1977
Z 6bb724162f736e953aeb890c4d631397 Z d2167933e8c62e7d24268a42c6d01402

2
manifest.uuid
View File

@@ -1 +1 @@
45fc70bd9264d5bcd72c97017079ced4aac7729f 9e9325997e11a0368721ed7860f4c37de3502a9b

6
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.503 2008/08/25 11:57:17 danielk1977 Exp $ ** $Id: btree.c,v 1.504 2008/08/27 15:16:34 danielk1977 Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information. ** See the header comment on "btreeInt.h" for additional information.
@@ -4347,7 +4347,7 @@ static int freePage(MemPage *pPage){
put4byte(&pTrunk->aData[4], k+1); put4byte(&pTrunk->aData[4], k+1);
put4byte(&pTrunk->aData[8+k*4], pPage->pgno); put4byte(&pTrunk->aData[8+k*4], pPage->pgno);
#ifndef SQLITE_SECURE_DELETE #ifndef SQLITE_SECURE_DELETE
sqlite3PagerDontWrite(pPage->pDbPage); rc = sqlite3PagerDontWrite(pPage->pDbPage);
#endif #endif
} }
TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno)); TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno));
@@ -7039,7 +7039,7 @@ static int btreeCopyFile(Btree *pTo, Btree *pFrom){
** page is still on the rollback journal, though. And that is the ** page is still on the rollback journal, though. And that is the
** whole point of this block: to put pages on the rollback journal. ** whole point of this block: to put pages on the rollback journal.
*/ */
sqlite3PagerDontWrite(pDbPage); rc = sqlite3PagerDontWrite(pDbPage);
} }
sqlite3PagerUnref(pDbPage); sqlite3PagerUnref(pDbPage);
} }

52
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.482 2008/08/27 09:44:40 danielk1977 Exp $ ** @(#) $Id: pager.c,v 1.483 2008/08/27 15:16:34 danielk1977 Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -191,6 +191,7 @@ struct Pager {
Pgno mxPgno; /* Maximum allowed size of the database */ Pgno mxPgno; /* Maximum allowed size of the database */
Bitvec *pInJournal; /* One bit for each page in the database file */ Bitvec *pInJournal; /* One bit for each page in the database file */
Bitvec *pInStmt; /* One bit for each page in the database */ Bitvec *pInStmt; /* One bit for each page in the database */
Bitvec *pAlwaysRollback; /* One bit for each page marked always-rollback */
char *zFilename; /* Name of the database file */ char *zFilename; /* Name of the database file */
char *zJournal; /* Name of the journal file */ char *zJournal; /* Name of the journal file */
char *zDirectory; /* Directory hold database and journal files */ char *zDirectory; /* Directory hold database and journal files */
@@ -895,6 +896,8 @@ static void pager_unlock(Pager *pPager){
pPager->journalOpen = 0; pPager->journalOpen = 0;
sqlite3BitvecDestroy(pPager->pInJournal); sqlite3BitvecDestroy(pPager->pInJournal);
pPager->pInJournal = 0; pPager->pInJournal = 0;
sqlite3BitvecDestroy(pPager->pAlwaysRollback);
pPager->pAlwaysRollback = 0;
} }
/* If Pager.errCode is set, the contents of the pager cache cannot be /* If Pager.errCode is set, the contents of the pager cache cannot be
@@ -985,12 +988,14 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
} }
sqlite3BitvecDestroy(pPager->pInJournal); sqlite3BitvecDestroy(pPager->pInJournal);
pPager->pInJournal = 0; pPager->pInJournal = 0;
sqlite3BitvecDestroy(pPager->pAlwaysRollback);
pPager->pAlwaysRollback = 0;
sqlite3PcacheCleanAll(pPager->pPCache); sqlite3PcacheCleanAll(pPager->pPCache);
#ifdef SQLITE_CHECK_PAGES #ifdef SQLITE_CHECK_PAGES
sqlite3PcacheIterate(pPager->pPCache, pager_set_pagehash); sqlite3PcacheIterate(pPager->pPCache, pager_set_pagehash);
#endif #endif
sqlite3PcacheSetFlags(pPager->pPCache, sqlite3PcacheSetFlags(pPager->pPCache,
~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC | PGHDR_ALWAYS_ROLLBACK), 0 ~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC), 0
); );
pPager->dirtyCache = 0; pPager->dirtyCache = 0;
pPager->nRec = 0; pPager->nRec = 0;
@@ -2201,6 +2206,7 @@ int sqlite3PagerClose(Pager *pPager){
sqlite3OsClose(pPager->jfd); sqlite3OsClose(pPager->jfd);
} }
sqlite3BitvecDestroy(pPager->pInJournal); sqlite3BitvecDestroy(pPager->pInJournal);
sqlite3BitvecDestroy(pPager->pAlwaysRollback);
if( pPager->stmtOpen ){ if( pPager->stmtOpen ){
sqlite3OsClose(pPager->stfd); sqlite3OsClose(pPager->stfd);
} }
@@ -2843,13 +2849,13 @@ static int pagerAcquire(
return rc; return rc;
} }
if( nMax<(int)pgno || MEMDB || (noContent && !pPager->alwaysRollback) ){ if( nMax<(int)pgno || MEMDB || noContent ){
if( pgno>pPager->mxPgno ){ if( pgno>pPager->mxPgno ){
sqlite3PagerUnref(pPg); sqlite3PagerUnref(pPg);
return SQLITE_FULL; return SQLITE_FULL;
} }
memset(pPg->pData, 0, pPager->pageSize); memset(pPg->pData, 0, pPager->pageSize);
if( noContent && !pPager->alwaysRollback ){ if( noContent ){
pPg->flags |= PGHDR_NEED_READ; pPg->flags |= PGHDR_NEED_READ;
} }
IOTRACE(("ZERO %p %d\n", pPager, pgno)); IOTRACE(("ZERO %p %d\n", pPager, pgno));
@@ -2985,7 +2991,6 @@ static int pager_open_journal(Pager *pPager){
pPager->journalOpen = 1; pPager->journalOpen = 1;
pPager->journalStarted = 0; pPager->journalStarted = 0;
pPager->needSync = 0; pPager->needSync = 0;
pPager->alwaysRollback = 0;
pPager->nRec = 0; pPager->nRec = 0;
if( pPager->errCode ){ if( pPager->errCode ){
rc = pPager->errCode; rc = pPager->errCode;
@@ -3434,13 +3439,24 @@ int sqlite3PagerIswriteable(DbPage *pPg){
** page contains critical data, we still need to be sure it gets ** page contains critical data, we still need to be sure it gets
** rolled back in spite of the sqlite3PagerDontRollback() call. ** rolled back in spite of the sqlite3PagerDontRollback() call.
*/ */
void sqlite3PagerDontWrite(DbPage *pDbPage){ int sqlite3PagerDontWrite(DbPage *pDbPage){
PgHdr *pPg = pDbPage; PgHdr *pPg = pDbPage;
Pager *pPager = pPg->pPager; Pager *pPager = pPg->pPager;
int rc;
if( MEMDB ) return; if( MEMDB || pPg->pgno>pPager->origDbSize ){
pPg->flags |= PGHDR_ALWAYS_ROLLBACK; return SQLITE_OK;
if( (pPg->flags&PGHDR_DIRTY) && !pPager->stmtInUse ){ }
if( pPager->pAlwaysRollback==0 ){
assert( pPager->pInJournal );
pPager->pAlwaysRollback = sqlite3BitvecCreate(pPager->origDbSize);
if( !pPager->pAlwaysRollback ){
return SQLITE_NOMEM;
}
}
rc = sqlite3BitvecSet(pPager->pAlwaysRollback, pPg->pgno);
if( rc==SQLITE_OK && (pPg->flags&PGHDR_DIRTY) && !pPager->stmtInUse ){
assert( pPager->state>=PAGER_SHARED ); assert( pPager->state>=PAGER_SHARED );
if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){ if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){
/* If this pages is the last page in the file and the file has grown /* If this pages is the last page in the file and the file has grown
@@ -3460,6 +3476,7 @@ void sqlite3PagerDontWrite(DbPage *pDbPage){
#endif #endif
} }
} }
return rc;
} }
/* /*
@@ -3482,15 +3499,16 @@ void sqlite3PagerDontRollback(DbPage *pPg){
** this page (DontWrite() sets the alwaysRollback flag), then this ** this page (DontWrite() sets the alwaysRollback flag), then this
** function is a no-op. ** function is a no-op.
*/ */
if( pPager->journalOpen==0 || (pPg->flags&PGHDR_ALWAYS_ROLLBACK) if( pPager->journalOpen==0
|| pPager->alwaysRollback || sqlite3BitvecTest(pPager->pAlwaysRollback, pPg->pgno)
|| pPg->pgno>pPager->origDbSize
){ ){
return; return;
} }
assert( !MEMDB ); /* For a memdb, pPager->journalOpen is always 0 */ assert( !MEMDB ); /* For a memdb, pPager->journalOpen is always 0 */
#ifdef SQLITE_SECURE_DELETE #ifdef SQLITE_SECURE_DELETE
if( pPg->inJournal || (int)pPg->pgno > pPager->origDbSize ){ if( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ){
return; return;
} }
#endif #endif
@@ -3782,7 +3800,7 @@ int sqlite3PagerCommitPhaseTwo(Pager *pPager){
sqlite3PcacheCommit(pPager->pPCache, 0); sqlite3PcacheCommit(pPager->pPCache, 0);
sqlite3PcacheCleanAll(pPager->pPCache); sqlite3PcacheCleanAll(pPager->pPCache);
sqlite3PcacheSetFlags(pPager->pPCache, sqlite3PcacheSetFlags(pPager->pPCache,
~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC | PGHDR_ALWAYS_ROLLBACK), 0 ~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC), 0
); );
pPager->state = PAGER_SHARED; pPager->state = PAGER_SHARED;
}else{ }else{
@@ -3813,7 +3831,7 @@ int sqlite3PagerRollback(Pager *pPager){
sqlite3PcacheRollback(pPager->pPCache, 0); sqlite3PcacheRollback(pPager->pPCache, 0);
sqlite3PcacheCleanAll(pPager->pPCache); sqlite3PcacheCleanAll(pPager->pPCache);
sqlite3PcacheSetFlags(pPager->pPCache, sqlite3PcacheSetFlags(pPager->pPCache,
~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC | PGHDR_ALWAYS_ROLLBACK), 0 ~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC), 0
); );
pPager->dbSize = pPager->origDbSize; pPager->dbSize = pPager->origDbSize;
pager_truncate_cache(pPager); pager_truncate_cache(pPager);
@@ -4232,8 +4250,4 @@ i64 sqlite3PagerJournalSizeLimit(Pager *pPager, i64 iLimit){
return pPager->journalSizeLimit; return pPager->journalSizeLimit;
} }
void sqlite3PagerAlwaysRollback(Pager *pPager){
pPager->alwaysRollback = 1;
}
#endif /* SQLITE_OMIT_DISKIO */ #endif /* SQLITE_OMIT_DISKIO */

4
src/pager.h
View File

@@ -13,7 +13,7 @@
** subsystem. The page cache subsystem reads and writes a file a page ** subsystem. The page cache subsystem reads and writes a file a page
** at a time and provides a journal for rollback. ** at a time and provides a journal for rollback.
** **
** @(#) $Id: pager.h,v 1.80 2008/08/22 17:34:45 drh Exp $ ** @(#) $Id: pager.h,v 1.81 2008/08/27 15:16:34 danielk1977 Exp $
*/ */
#ifndef _PAGER_H_ #ifndef _PAGER_H_
@@ -95,7 +95,7 @@ int sqlite3PagerStmtBegin(Pager*);
int sqlite3PagerStmtCommit(Pager*); int sqlite3PagerStmtCommit(Pager*);
int sqlite3PagerStmtRollback(Pager*); int sqlite3PagerStmtRollback(Pager*);
void sqlite3PagerDontRollback(DbPage*); void sqlite3PagerDontRollback(DbPage*);
void sqlite3PagerDontWrite(DbPage*); int sqlite3PagerDontWrite(DbPage*);
int sqlite3PagerRefcount(Pager*); int sqlite3PagerRefcount(Pager*);
void sqlite3PagerSetSafetyLevel(Pager*,int,int); void sqlite3PagerSetSafetyLevel(Pager*,int,int);
const char *sqlite3PagerFilename(Pager*); const char *sqlite3PagerFilename(Pager*);

11
src/pcache.c
View File

@@ -11,7 +11,7 @@
************************************************************************* *************************************************************************
** This file implements that page cache. ** This file implements that page cache.
** **
** @(#) $Id: pcache.c,v 1.16 2008/08/27 09:44:40 danielk1977 Exp $ ** @(#) $Id: pcache.c,v 1.17 2008/08/27 15:16:34 danielk1977 Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -497,15 +497,6 @@ static PgHdr *pcacheRecyclePage(){
pcacheRemoveFromLruList(p); pcacheRemoveFromLruList(p);
pcacheRemoveFromHash(p); pcacheRemoveFromHash(p);
pcacheRemoveFromList(&p->pCache->pClean, p); pcacheRemoveFromList(&p->pCache->pClean, p);
/* If the always-rollback flag is set on the page being recycled, set
** the always-rollback flag on the corresponding pager. TODO: This is
** a thread-safety problem.
*/
if( p->flags&PGHDR_ALWAYS_ROLLBACK ){
assert(p->pPager);
sqlite3PagerAlwaysRollback(p->pPager);
}
} }
return p; return p;

3
src/pcache.h
View File

@@ -12,7 +12,7 @@
** This header file defines the interface that the sqlite page cache ** This header file defines the interface that the sqlite page cache
** subsystem. ** subsystem.
** **
** @(#) $Id: pcache.h,v 1.6 2008/08/26 18:05:48 danielk1977 Exp $ ** @(#) $Id: pcache.h,v 1.7 2008/08/27 15:16:34 danielk1977 Exp $
*/ */
#ifndef _PCACHE_H_ #ifndef _PCACHE_H_
@@ -48,7 +48,6 @@ struct PgHdr {
#define PGHDR_IN_STMTJRNL 0x002 /* Page is in the statement journal */ #define PGHDR_IN_STMTJRNL 0x002 /* Page is in the statement journal */
#define PGHDR_DIRTY 0x004 /* Page has changed */ #define PGHDR_DIRTY 0x004 /* Page has changed */
#define PGHDR_NEED_SYNC 0x008 /* Peed to fsync this page */ #define PGHDR_NEED_SYNC 0x008 /* Peed to fsync this page */
#define PGHDR_ALWAYS_ROLLBACK 0x010 /* Force writing to journal */
#define PGHDR_NEED_READ 0x020 /* Content is unread */ #define PGHDR_NEED_READ 0x020 /* Content is unread */
#define PGHDR_IS_INIT 0x040 /* pData is initialized */ #define PGHDR_IS_INIT 0x040 /* pData is initialized */
#define PGHDR_REUSE_UNLIKELY 0x080 /* Hint: Reuse is unlikely */ #define PGHDR_REUSE_UNLIKELY 0x080 /* Hint: Reuse is unlikely */