Fix an obscure pager refcnt leak that occurs following a transient I/O

error. (CVS 3829)

FossilOrigin-Name: ce6f56ece8eab743d20cd2c0a84b4a266c4da2ff

diff --git a/manifest b/manifest
index a9bec1813e469d5ee55da7aa7c3f9bd10e59626c..69de2d142a0ab77c6f87b212ad1dd7bd8388a574 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sthe\spager\scall\sxReiniter()\sinstead\sof\sxDestructor()\sto\srestore\sbtree\slevel\sstate\safter\srolling\sback\sa\spage.\s(CVS\s3828)
-D 2007-04-09T11:20:54
+C Fix\san\sobscure\spager\srefcnt\sleak\sthat\soccurs\sfollowing\sa\stransient\sI/O\nerror.\s(CVS\s3829)
+D 2007-04-09T12:45:03
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -58,7 +58,7 @@ F src/alter.c 2c79ec40f65e33deaf90ca493422c74586e481a3
 F src/analyze.c 4bbf5ddf9680587c6d4917e02e378b6037be3651
 F src/attach.c a16ada4a4654a0d126b8223ec9494ebb81bc5c3c
 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f
-F src/btree.c ea98c5549ef0b3d13e0d22e0d043fd07df972096
+F src/btree.c 7adc16a10b42d3a3c39e64af85b748c68156f6b2
 F src/btree.h 9b2cc0d113c0bc2d37d244b9a394d56948c9acbf
 F src/build.c 7c2efa468f0c404ef5aa648d43c383318390937f
 F src/callback.c 31d22b4919c7645cbcbb1591ce2453e8c677c558
@@ -101,7 +101,7 @@ F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
 F src/sqliteInt.h 347160d30eb61210417f1086aeb57d7d3e2a8191
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c ec69eb9ad56d03fbf7570ca1ca5ea947d1ec4b6f
-F src/test1.c 35ad59fa1eca03489e53de1d611aaeb99df432bc
+F src/test1.c 9f85126e66a9a1ec463b609cd0221c151a723e2c
 F src/test2.c 24458b17ab2f3c90cbc1c8446bd7ffe69be62f88
 F src/test3.c 65f92247cf8592854e9bf5115b3fb711f8b33280
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -245,7 +245,7 @@ F test/insert4.test 0bb119fea2868afdcf78e4e3e3bfed27bbdb2430
 F test/interrupt.test c38b7f7c17914f0cd6a119beed5d03bc3f47f9eb
 F test/intpkey.test af4fd826c4784ec5c93b444de07adea0254d0d30
 F test/ioerr.test 491d42c49bbec598966d26b01ed7901f55e5ee2d
-F test/ioerr2.test d37de99aa6e96ad55c3503b6365346e019c5ed6e
+F test/ioerr2.test 23c5f19304625d48c12775ee4a23d54e125c47cb
 F test/join.test af0443185378b64878750aa1cf4b83c216f246b4
 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
@@ -455,7 +455,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 5424fcc5f82e864e0a85a71e0ae39209200386c6
-R 27ca5f36da384c7469144b8aa517ce6b
-U danielk1977
-Z dce029906fcde6f3be2aa17f46e3fa64
+P 4e8941333ef053442877a2a696a2c68d403c7f4d
+R 28730f6b46e2731a59a5f5532af95ebe
+U drh
+Z d3bb3944bdcc85b73a9d94fa04080f58

diff --git a/manifest.uuid b/manifest.uuid
index e32f489504616af72a989d926caeeb5d15e4866e..37b9822165c1542017b708b40a3180a9e531ac79 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e8941333ef053442877a2a696a2c68d403c7f4d
\ No newline at end of file
+ce6f56ece8eab743d20cd2c0a84b4a266c4da2ff
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a69e3950c0fa188e4c2038e5bcfe203f8c31bbda..8665c510426ba71ce5091ea2494add7cef67c768 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.353 2007/04/07 15:03:17 danielk1977 Exp $
+** $Id: btree.c,v 1.354 2007/04/09 12:45:03 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -3944,12 +3944,13 @@ static int freePage(MemPage *pPage){
     }else{
       /* Add the newly freed page as a leaf on the current trunk */
       rc = sqlite3PagerWrite(pTrunk->pDbPage);
-      if( rc ) return rc;
-      put4byte(&pTrunk->aData[4], k+1);
-      put4byte(&pTrunk->aData[8+k*4], pPage->pgno);
+      if( rc==SQLITE_OK ){
+        put4byte(&pTrunk->aData[4], k+1);
+        put4byte(&pTrunk->aData[8+k*4], pPage->pgno);
 #ifndef SQLITE_SECURE_DELETE
-      sqlite3PagerDontWrite(pBt->pPager, pPage->pgno);
+        sqlite3PagerDontWrite(pBt->pPager, pPage->pgno);
 #endif
+      }
       TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno));
     }
     releasePage(pTrunk);
@@ -4835,14 +4836,15 @@ static int balance_nonroot(MemPage *pPage){
       pgnoNew[i] = pgnoOld[i];
       apOld[i] = 0;
       rc = sqlite3PagerWrite(pNew->pDbPage);
+      nNew++;
       if( rc ) goto balance_cleanup;
     }else{
       assert( i>0 );
       rc = allocateBtreePage(pBt, &pNew, &pgnoNew[i], pgnoNew[i-1], 0);
       if( rc ) goto balance_cleanup;
       apNew[i] = pNew;
+      nNew++;
     }
-    nNew++;
     zeroPage(pNew, pageFlags);
   }
 
@@ -5419,11 +5421,6 @@ int sqlite3BtreeDelete(BtCursor *pCur){
     assert( !pPage->leafData );
     getTempCursor(pCur, &leafCur);
     rc = sqlite3BtreeNext(&leafCur, &notUsed);
-    if( rc!=SQLITE_OK ){
-      if( rc!=SQLITE_NOMEM ){
-        rc = SQLITE_CORRUPT_BKPT; 
-      }
-    }
     if( rc==SQLITE_OK ){
       rc = sqlite3PagerWrite(leafCur.pPage->pDbPage);
     }

diff --git a/src/test1.c b/src/test1.c
index f9c82b9ec1a072e6e92e5009a9da7ec78be3dbfe..5f30a2805baf404050ff8121a59e5e6450a7f19c 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.235 2007/04/06 21:42:22 drh Exp $
+** $Id: test1.c,v 1.236 2007/04/09 12:45:03 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3753,8 +3753,8 @@ static int test_thread_cleanup(
 /*
 ** Usage:   sqlite3_pager_refcounts  DB
 **
-** Return a list of numbers when are the PagerRefcount for each
-** pager on each database.
+** Return a list of numbers which are the PagerRefcount for all
+** pagers on each database connection.
 */
 static int test_pager_refcounts(
   void * clientData,
@@ -3769,7 +3769,7 @@ static int test_pager_refcounts(
 
   if( objc!=2 ){
     Tcl_AppendResult(interp, "wrong # args: should be \"",
-        Tcl_GetStringFromObj(objv[0], 0), " <STMT>", 0);
+        Tcl_GetStringFromObj(objv[0], 0), " DB", 0);
     return TCL_ERROR;
   }
   if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;

diff --git a/test/ioerr2.test b/test/ioerr2.test
index 258b805e3f35a5c8cea6b6c46d16e779cdbd2803..394d59d4aff8e1d43d8d6a078cc96ad6fff2c035 100644 (file)
--- a/test/ioerr2.test
+++ b/test/ioerr2.test
@@ -15,7 +15,7 @@
 # The tests in this file use special facilities that are only
 # available in the SQLite test fixture.
 #
-# $Id: ioerr2.test,v 1.2 2007/04/09 11:20:54 danielk1977 Exp $
+# $Id: ioerr2.test,v 1.3 2007/04/09 12:45:03 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -50,6 +50,7 @@ proc check_db {testname} {
   if {$rc && $msg eq "disk I/O error"} {
     db close
     sqlite3 db test.db
+    set refcnt 0
   } else {
     if {$rc || $msg ne "ok"} {
       error $msg
@@ -62,6 +63,9 @@ proc check_db {testname} {
   set ck [execsql {SELECT md5sum(a, b) FROM t1}]
   do_test ${testname}.cksum [list set ck $ck] $::cksum
   integrity_check ${testname}.integrity
+  do_test ${testname}.refcnt {
+    lindex [sqlite3_pager_refcounts db] 0
+  } 0
 }
 
 check_db ioerr2-2