Use a bitvec object to store the set of pages with the 'always-rollback' property...

FossilOrigin-Name: 9e9325997e11a0368721ed7860f4c37de3502a9b

diff --git a/manifest b/manifest
index bcc5cf1c9c9f66ccf96267a8758aeb095064cb77..e8340de74e7dae68f037e0a604e1aeee320ac8de 100644 (file)
--- a/manifest
+++ b/manifest
@@ -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)
-D 2008-08-27T13:31:10
+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-27T15:16:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -96,7 +96,7 @@ F src/attach.c db3f4a60538733c1e4dcb9d0217a6e0d6ccd615b
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
 F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
-F src/btree.c f6a1f698b1625da624457d25436e1a639631ffb3
+F src/btree.c 9b98b0d2e2273998b13a74856d5c62971b35449c
 F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107
 F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
 F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
@@ -134,11 +134,11 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
 F src/os_unix.c 4665cef7639dd937893c3ea076f0e8a8f215bb32
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
-F src/pager.c 095efa75a1a6500e6e975d1f7ddad34ed25424ae
-F src/pager.h 3b9c138d2e744b9d6e61d4c2742301e3bf464864
+F src/pager.c a38742815a6b2238d0b91d1dd64bda50d6ee95fc
+F src/pager.h 914103bb62dbcc3d8e9f14baec812d027264d457
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
-F src/pcache.c 9e00544dd8c2bc93087050fecad9767353a9b81d
-F src/pcache.h 3531f83e1771442af16f6ffeac68024ff8c8bb2d
+F src/pcache.c 94050f68015c883813e39cd222b21d7728ad1203
+F src/pcache.h 7a50b77f06c220ff7696be1a9f2a17c9e6ddc486
 F src/pragma.c f5b271b090af7fcedd308d7c5807a5503f7a853d
 F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510
 F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 7de32498b349e046c5c886de255bbdefd6a7e8f7
-R a8e55ba2d18a22da01faf295df6cff77
-U drh
-Z 6bb724162f736e953aeb890c4d631397
+P 45fc70bd9264d5bcd72c97017079ced4aac7729f
+R c500546293e96bf186a034cac9d9bde9
+U danielk1977
+Z d2167933e8c62e7d24268a42c6d01402

diff --git a/manifest.uuid b/manifest.uuid
index fd63f5589cd26e1c962e1f602357530c8dd63f8d..0f134ab568ebc47e830016f2151138dd6dc7a2cc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45fc70bd9264d5bcd72c97017079ced4aac7729f
\ No newline at end of file
+9e9325997e11a0368721ed7860f4c37de3502a9b
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 45184c422a21c1d870d0468efe08332a2575fb85..e4eff218103ce090243032ee5959ddc2f9bab32d 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    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.
 ** 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[8+k*4], pPage->pgno);
 #ifndef SQLITE_SECURE_DELETE
-        sqlite3PagerDontWrite(pPage->pDbPage);
+        rc = sqlite3PagerDontWrite(pPage->pDbPage);
 #endif
       }
       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 
           ** whole point of this block: to put pages on the rollback journal. 
           */
-          sqlite3PagerDontWrite(pDbPage);
+          rc = sqlite3PagerDontWrite(pDbPage);
         }
         sqlite3PagerUnref(pDbPage);
       }

diff --git a/src/pager.c b/src/pager.c
index 7d122aee0cc494aaafed6b864b125b9a2671ef40..196e23e25ba2b10d92ee163906e5abce0c791426 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** 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
 #include "sqliteInt.h"
@@ -191,6 +191,7 @@ struct Pager {
   Pgno mxPgno;                /* Maximum allowed size of the database */
   Bitvec *pInJournal;         /* One bit for each page in the database file */
   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 *zJournal;             /* Name of the journal file */
   char *zDirectory;           /* Directory hold database and journal files */
@@ -895,6 +896,8 @@ static void pager_unlock(Pager *pPager){
         pPager->journalOpen = 0;
         sqlite3BitvecDestroy(pPager->pInJournal);
         pPager->pInJournal = 0;
+        sqlite3BitvecDestroy(pPager->pAlwaysRollback);
+        pPager->pAlwaysRollback = 0;
       }
 
       /* 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);
     pPager->pInJournal = 0;
+    sqlite3BitvecDestroy(pPager->pAlwaysRollback);
+    pPager->pAlwaysRollback = 0;
     sqlite3PcacheCleanAll(pPager->pPCache);
 #ifdef SQLITE_CHECK_PAGES
     sqlite3PcacheIterate(pPager->pPCache, pager_set_pagehash);
 #endif
-    sqlite3PcacheSetFlags(pPager->pPCache, 
-       ~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC | PGHDR_ALWAYS_ROLLBACK), 0
+    sqlite3PcacheSetFlags(pPager->pPCache,
+       ~(PGHDR_IN_JOURNAL | PGHDR_NEED_SYNC), 0
     );
     pPager->dirtyCache = 0;
     pPager->nRec = 0;
@@ -2201,6 +2206,7 @@ int sqlite3PagerClose(Pager *pPager){
     sqlite3OsClose(pPager->jfd);
   }
   sqlite3BitvecDestroy(pPager->pInJournal);
+  sqlite3BitvecDestroy(pPager->pAlwaysRollback);
   if( pPager->stmtOpen ){
     sqlite3OsClose(pPager->stfd);
   }
@@ -2843,13 +2849,13 @@ static int pagerAcquire(
       return rc;
     }
 
-    if( nMax<(int)pgno || MEMDB || (noContent && !pPager->alwaysRollback) ){
+    if( nMax<(int)pgno || MEMDB || noContent ){
       if( pgno>pPager->mxPgno ){
         sqlite3PagerUnref(pPg);
         return SQLITE_FULL;
       }
       memset(pPg->pData, 0, pPager->pageSize);
-      if( noContent && !pPager->alwaysRollback ){
+      if( noContent ){
         pPg->flags |= PGHDR_NEED_READ;
       }
       IOTRACE(("ZERO %p %d\n", pPager, pgno));
@@ -2985,7 +2991,6 @@ static int pager_open_journal(Pager *pPager){
   pPager->journalOpen = 1;
   pPager->journalStarted = 0;
   pPager->needSync = 0;
-  pPager->alwaysRollback = 0;
   pPager->nRec = 0;
   if( 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
 ** rolled back in spite of the sqlite3PagerDontRollback() call.
 */
-void sqlite3PagerDontWrite(DbPage *pDbPage){
+int sqlite3PagerDontWrite(DbPage *pDbPage){
   PgHdr *pPg = pDbPage;
   Pager *pPager = pPg->pPager;
+  int rc;
 
-  if( MEMDB ) return;
-  pPg->flags |= PGHDR_ALWAYS_ROLLBACK;
-  if( (pPg->flags&PGHDR_DIRTY) && !pPager->stmtInUse ){
+  if( MEMDB || pPg->pgno>pPager->origDbSize ){
+    return SQLITE_OK;
+  }
+  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 );
     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
@@ -3460,6 +3476,7 @@ void sqlite3PagerDontWrite(DbPage *pDbPage){
 #endif
     }
   }
+  return rc;
 }
 
 /*
@@ -3482,15 +3499,16 @@ void sqlite3PagerDontRollback(DbPage *pPg){
   ** this page (DontWrite() sets the alwaysRollback flag), then this
   ** function is a no-op.
   */
-  if( pPager->journalOpen==0 || (pPg->flags&PGHDR_ALWAYS_ROLLBACK) 
-   || pPager->alwaysRollback 
+  if( pPager->journalOpen==0 
+   || sqlite3BitvecTest(pPager->pAlwaysRollback, pPg->pgno)
+   || pPg->pgno>pPager->origDbSize
   ){
     return;
   }
   assert( !MEMDB );    /* For a memdb, pPager->journalOpen is always 0 */
 
 #ifdef SQLITE_SECURE_DELETE
-  if( pPg->inJournal || (int)pPg->pgno > pPager->origDbSize ){
+  if( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ){
     return;
   }
 #endif
@@ -3782,7 +3800,7 @@ int sqlite3PagerCommitPhaseTwo(Pager *pPager){
     sqlite3PcacheCommit(pPager->pPCache, 0);
     sqlite3PcacheCleanAll(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;
   }else{
@@ -3813,7 +3831,7 @@ int sqlite3PagerRollback(Pager *pPager){
     sqlite3PcacheRollback(pPager->pPCache, 0);
     sqlite3PcacheCleanAll(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;
     pager_truncate_cache(pPager);
@@ -4232,8 +4250,4 @@ i64 sqlite3PagerJournalSizeLimit(Pager *pPager, i64 iLimit){
   return pPager->journalSizeLimit;
 }
 
-void sqlite3PagerAlwaysRollback(Pager *pPager){
-  pPager->alwaysRollback = 1;
-}
-
 #endif /* SQLITE_OMIT_DISKIO */

diff --git a/src/pager.h b/src/pager.h
index 50bce8a3f565dea9f513057ace6d346d7c8f2d59..305eff1c828d26d87e0c296db32048a72e396e23 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -13,7 +13,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** 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_
@@ -95,7 +95,7 @@ int sqlite3PagerStmtBegin(Pager*);
 int sqlite3PagerStmtCommit(Pager*);
 int sqlite3PagerStmtRollback(Pager*);
 void sqlite3PagerDontRollback(DbPage*);
-void sqlite3PagerDontWrite(DbPage*);
+int sqlite3PagerDontWrite(DbPage*);
 int sqlite3PagerRefcount(Pager*);
 void sqlite3PagerSetSafetyLevel(Pager*,int,int);
 const char *sqlite3PagerFilename(Pager*);

diff --git a/src/pcache.c b/src/pcache.c
index db2ec83b0256ca32549ae335b38901b2a8692a93..07300ade85cf2f0cf1404fc5bd8339561659678d 100644 (file)
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** 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"
 
@@ -497,15 +497,6 @@ static PgHdr *pcacheRecyclePage(){
     pcacheRemoveFromLruList(p);
     pcacheRemoveFromHash(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;

diff --git a/src/pcache.h b/src/pcache.h
index 0fc3b7df3cea46195f842afc74d00bd5f76786b0..8dcc3655aa1aa3462077f9cf975ca00bcf6cf7d9 100644 (file)
--- a/src/pcache.h
+++ b/src/pcache.h
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the sqlite page cache
 ** 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_
@@ -48,7 +48,6 @@ struct PgHdr {
 #define PGHDR_IN_STMTJRNL       0x002  /* Page is in the statement journal */
 #define PGHDR_DIRTY             0x004  /* Page has changed */
 #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_IS_INIT           0x040  /* pData is initialized */
 #define PGHDR_REUSE_UNLIKELY    0x080  /* Hint: Reuse is unlikely */