Update comments and remove unused code in btree.c. No functional changes. (CVS 6521)

FossilOrigin-Name: bd860184909b7a9cc32c59770ebcee0efdc491f0

diff --git a/manifest b/manifest
index 8497c6ad0629356b643cd3513e8b5d0557f9c7f7..87a570653e2018b371ef8786dacf1106bd834b6f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sextra\scalls\sto\ssqlite3_shutdown()\sbe\sharmless\sno-ops.\s(CVS\s6520)
-D 2009-04-19T12:23:58
+C Update\scomments\sand\sremove\sunused\scode\sin\sbtree.c.\s\sNo\sfunctional\schanges.\s(CVS\s6521)
+D 2009-04-19T20:51:07
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
 F src/bitvec.c ef370407e03440b0852d05024fb016b14a471d3d
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c 103858ade0ad7d3320aadae936557e48b84bf3c2
+F src/btree.c b4ec46b3adc3e2d82704c949d4b654b031a64ad6
 F src/btree.h 99fcc7e8c4a1e35afe271bcb38de1a698dfc904e
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 2882f22078db1c3f887b1aca77ff460cf9461c62
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P bb1a390a3d2f79b27e3ec2514ae00f5b22dbfb06
-R bfe81c34d0885c2bfee07a323015841e
+P d80822953c2d2f2fd7f6acdd3caa403c0decacc4
+R 1aeac7e626ad8c712d8be267be9624bb
 U drh
-Z b04415dd5b051642fb17a59a62ddd487
+Z e1e6fd3e9710fd0e165194b49bd9ea30

diff --git a/manifest.uuid b/manifest.uuid
index 9bec9f7bc18bf4b275adf37c2a701fa9d032f848..2d748534feb013b58bc7ab06e9197490b384ea24 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d80822953c2d2f2fd7f6acdd3caa403c0decacc4
\ No newline at end of file
+bd860184909b7a9cc32c59770ebcee0efdc491f0
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index d928559d410e4aa3214132b85029128c52f35e89..1a8ddf3589dd0261e6309ae532a4dbeb05859dbc 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.595 2009/04/11 16:06:15 danielk1977 Exp $
+** $Id: btree.c,v 1.596 2009/04/19 20:51:07 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -2029,14 +2029,6 @@ static void unlockBtreeIfUnused(BtShared *pBt){
   if( pBt->inTransaction==TRANS_NONE && pBt->pCursor==0 && pBt->pPage1!=0 ){
     if( sqlite3PagerRefcount(pBt->pPager)>=1 ){
       assert( pBt->pPage1->aData );
-#if 0
-      if( pBt->pPage1->aData==0 ){
-        MemPage *pPage = pBt->pPage1;
-        pPage->aData = sqlite3PagerGetData(pPage->pDbPage);
-        pPage->pBt = pBt;
-        pPage->pgno = 1;
-      }
-#endif
       releasePage(pBt->pPage1);
     }
     pBt->pPage1 = 0;
@@ -2629,7 +2621,7 @@ static int autoVacuumCommit(BtShared *pBt){
 ** database are written into the database file and flushed to oxide.
 ** At the end of this call, the rollback journal still exists on the
 ** disk and we are still holding all locks, so the transaction has not
-** committed.  See sqlite3BtreeCommit() for the second phase of the
+** committed.  See sqlite3BtreeCommitPhaseTwo() for the second phase of the
 ** commit process.
 **
 ** This call is a no-op if no write-transaction is currently active on pBt.
@@ -2669,12 +2661,13 @@ int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){
 ** Commit the transaction currently in progress.
 **
 ** This routine implements the second phase of a 2-phase commit.  The
-** sqlite3BtreeSync() routine does the first phase and should be invoked
-** prior to calling this routine.  The sqlite3BtreeSync() routine did
-** all the work of writing information out to disk and flushing the
+** sqlite3BtreeCommitPhaseOne() routine does the first phase and should
+** be invoked prior to calling this routine.  The sqlite3BtreeCommitPhaseOne()
+** routine did all the work of writing information out to disk and flushing the
 ** contents so that they are written onto the disk platter.  All this
-** routine has to do is delete or truncate the rollback journal
-** (which causes the transaction to commit) and drop locks.
+** routine has to do is delete or truncate or zero the header in the
+** the rollback journal (which causes the transaction to commit) and
+** drop locks.
 **
 ** This will release the write lock on the database file.  If there
 ** are no active cursors, it also releases the read lock.
@@ -2713,7 +2706,7 @@ int sqlite3BtreeCommitPhaseTwo(Btree *p){
     }
   }
 
-  /* Set the handles current transaction state to TRANS_NONE and unlock
+  /* Set the current transaction state to TRANS_NONE and unlock
   ** the pager if this call closed the only read or write transaction.
   */
   btreeClearHasContent(pBt);