Fix a failing assert() in wal.c.

FossilOrigin-Name: 8745530b9a877db77fe2ca3ea9c6bc99ce033055

diff --git a/manifest b/manifest
index 1779f31e8b91f6433ce09efd8026876cf8ba2696..0c609fcf261f999b3e01bcf88534fd6edd44cb4f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\swhen\sthe\ssource\sof\sa\sbackup\sis\sa\sdatabase\sthat\sis\szero\sbytes\s\nin\ssize,\sthe\sfinal\sdestination\sdatabase\sconsists\sof\sat\sleast\sone\spage.\s\nTruncating\sit\sto\szero\sbytes\sis\sequivalent\sto\szeroing\sthe\sschema\scookie\s\nand\schange\scounter,\swhich\scan\scause\sproblems\sfor\sexisting\sclients.
-D 2012-10-13T23:16:00.555
+C Fix\sa\sfailing\sassert()\sin\swal.c.
+D 2012-10-15T11:28:24.947
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -246,7 +246,7 @@ F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
 F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c 9c64ae18af78c740610df841c6f49fc2d240a279
-F src/wal.c e1fe8f92a0ea0fef8faa87ec43a127a478589d22
+F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
 F src/where.c 3e6c1f9efe4c6a029b0a750e0f6a63964f43bcce
@@ -942,6 +942,7 @@ F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
 F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 F test/wal8.test b3ee739fe8f7586aaebdc2367f477ebcf3e3b034
+F test/wal9.test b4eb5d27170c65ee9c8ff9c9e76babd902a13cfc
 F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
@@ -1020,7 +1021,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P dce391fc6302301e9ac53a5e4fc69f3bd7ba13a7 ae025cae2266a91d4226bbdb66f82b9d7714750a
-R 6411855ed00a2b0cd5f5a66552e9b1b4
-U drh
-Z 1d2efa01eaf44e38b73ed9ee9ed57fac
+P ca86138bda26c5ac5a7e67351acbd19fbd39b0ae
+R 1adb0472104019713641ff3149a537e4
+U dan
+Z 82a77f3539e233996c3bcae559658f67

diff --git a/manifest.uuid b/manifest.uuid
index 62b32c975439ba4836b9e52d825818ee64d1da94..96923ec6e558ac571ed2e0ddc89cc673a779882b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca86138bda26c5ac5a7e67351acbd19fbd39b0ae
\ No newline at end of file
+8745530b9a877db77fe2ca3ea9c6bc99ce033055
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 8394bfa29f2712e386ca09a243365050aa319a47..0d7271bf04f97660b41f97a64c1250c6cb01db08 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2518,7 +2518,7 @@ int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *pUndoCtx){
       assert( walFramePgno(pWal, iFrame)!=1 );
       rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
     }
-    walCleanupHash(pWal);
+    if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
   }
   assert( rc==SQLITE_OK );
   return rc;

diff --git a/test/wal9.test b/test/wal9.test
new file mode 100644 (file)
index 0000000..a219e30
--- /dev/null
+++ b/test/wal9.test
@@ -0,0 +1,90 @@
+# 2012 October 15
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# 
+# This test case tests that a problem causing a failing assert() has
+# been fixed. The problem occurred if a writer process with a subset
+# of the *shm file mapped rolled back a transaction begun after the
+# entire WAL file was checkpointed into the db file (i.e. a transaction
+# that would have restarted the WAL file from the beginning).
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix wal9
+
+sqlite3 db2 test.db
+
+do_execsql_test 1.0 {
+  PRAGMA page_size = 1024;
+  PRAGMA journal_mode = WAL;
+  PRAGMA wal_autocheckpoint = 0;
+  CREATE TABLE t(x);
+} {wal 0}
+
+do_test 1.1 { 
+  execsql "SELECT * FROM t" db2
+} {}
+
+do_execsql_test 1.2 {
+  BEGIN;
+    INSERT INTO t VALUES(randomblob(100));
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+
+    INSERT INTO t SELECT randomblob(100) FROM t;
+    INSERT INTO t SELECT randomblob(100) FROM t;
+  COMMIT;
+} {}
+
+# Check file sizes are as expected. The real requirement here is that 
+# the *shm file is now more than one chunk (>32KiB).
+do_test 1.3 { file size test.db     } {1024}
+do_test 1.4 { file size test.db-wal } {15421352}
+do_test 1.5 { file size test.db-shm } {131072}
+
+do_execsql_test 1.6 { PRAGMA wal_checkpoint } {0 14715 14715}
+
+# At this point connection [db2] has mapped the first 32KB of the *shm file
+# only. Because the entire WAL file has been checkpointed, it is not 
+# necessary to map any more of the *-shm file to read or write the database
+# (since all data will be read directly from the db file). 
+#
+# However, at one point if a transaction that had not yet written to the 
+# WAL file was rolled back an assert() attempting to verify that the entire 
+# *-shm file was mapped would fail. If NDEBUG was defined (and the assert() 
+# disabled) this bug caused SQLite to ignore the return code of a mmap() 
+# call.
+#
+do_test 1.7 {
+  execsql { 
+    BEGIN;
+      INSERT INTO t VALUES('hello');
+    ROLLBACK;
+  } db2
+} {}
+db2 close
+
+finish_test
+