Add a test script for ticket #2565. Change the assert() in pager.c into

a testcase() macro. (CVS 6142)

FossilOrigin-Name: 1e53e382e5030de4d908098bf77af053dd81f0c5

diff --git a/manifest b/manifest
index 3af766d6978a712c6ccd809620178ba15841bd47..bec3c59030f0d71873e4a66e4d6cfae8e2026df1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sdatabase\sfiles\sto\sbe\screated\sin\sthe\sroot\sdirectory\son\sunix.\nTicket\s#3570.\s(CVS\s6141)
-D 2009-01-08T14:36:20
+C Add\sa\stest\sscript\sfor\sticket\s#2565.\s\sChange\sthe\sassert()\sin\spager.c\sinto\na\stestcase()\smacro.\s(CVS\s6142)
+D 2009-01-08T15:24:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -142,7 +142,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c a1f05f59c24e61186c981f2a7fea13986db620f1
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
-F src/pager.c 76d62924b6547eeff64ce8b9ecec26f74c3dcf33
+F src/pager.c 2b35462d94ef080eb21902ba4747593ef261069f
 F src/pager.h 9870acb2d653848d90d765d7cbf163496d6c8111
 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
@@ -577,6 +577,7 @@ F test/tkt2339.test 73bd17818924cd2ac442e5fd9916b58565739450
 F test/tkt2391.test ab7a11be7402da8b51a5be603425367aa0684567
 F test/tkt2409.test 464d55beb32e3b12ce2b4bbf9857d063c4c34297
 F test/tkt2450.test 77ed94863f2049c1420288ddfea2d41e5e0971d6
+F test/tkt2565.test de9673c9e3affbf9574c0727556c5140cb9c53a4
 F test/tkt2640.test 28134f5d1e05658ef182520cf0b680fa3de5211b
 F test/tkt2643.test 3f3ebb743da00d4fed4fcf6daed92a0e18e57813
 F test/tkt2686.test 08f0f584461bc4990376936daa0a9bd3e6e81671
@@ -694,7 +695,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 5a28c7c7b45655dcfd0da4898e77d0240b511c5f
-R af7b2247b25a096c92d1790f9e29e088
+P 81014334ad57e380e21c47ad6eebe9f16b4ad24c
+R 1fb9e89475372962c965501bf1119839
 U drh
-Z 14218f1c72245c1a8f9babdc16f10aad
+Z f5bb78d1eaf6298f714991d532608b85

diff --git a/manifest.uuid b/manifest.uuid
index e0307c3f8d47471fb81fcbe3a749f391444e770e..3a243b6a65b3f0625438f133f04caabf8ad0ab3d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81014334ad57e380e21c47ad6eebe9f16b4ad24c
\ No newline at end of file
+1e53e382e5030de4d908098bf77af053dd81f0c5
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 0ee2e18ca3970047ed6f4e43d74bdd3933fd4d4a..08075058dde967038d61aef333cb5d22c9535a1e 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.540 2009/01/07 18:08:49 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.541 2009/01/08 15:24:02 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1647,14 +1647,11 @@ static int pager_playback(Pager *pPager, int isHot){
     ** the journal, it means that the journal might contain additional
     ** pages that need to be rolled back and that the number of pages 
     ** should be computed based on the journal file size.
-    **
-    ** 2009-01-07:  We think #2565 is now unreachable due to changes
-    ** in the pcache.  The assert that follows will fire if we are wrong.
     */
-    assert( !(nRec==0 && !isHot
+    testcase( nRec==0 && !isHot
          && pPager->journalHdr+JOURNAL_HDR_SZ(pPager)!=pPager->journalOff
          && ((szJ - pPager->journalOff) / JOURNAL_PG_SZ(pPager))>0
-         && pagerNextJournalPageIsValid(pPager))
+         && pagerNextJournalPageIsValid(pPager)
     );
     if( nRec==0 && !isHot &&
         pPager->journalHdr+JOURNAL_HDR_SZ(pPager)==pPager->journalOff ){

diff --git a/test/tkt2565.test b/test/tkt2565.test
new file mode 100644 (file)
index 0000000..dbf67e9
--- /dev/null
+++ b/test/tkt2565.test
@@ -0,0 +1,90 @@
+# 2009 January 8
+#
+# 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 script attempts to reproduce the circumstances of ticket #2565.
+#
+# More specifically, this script attempts to generate rollback journals
+# that contain headers with nRec==0 that are followed by additional
+# valid headers.
+#
+# $Id: tkt2565.test,v 1.1 2009/01/08 15:24:02 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# Use the alternative pcache and rig it to call pagerStress()
+# very frequently.
+#
+db close
+sqlite3_shutdown
+sqlite3_config_alt_pcache 1 100 0 1
+
+# Open two database connections to database "test.db".
+#
+proc reopen_database {} {
+  catch {db close}
+  sqlite3 db test.db
+  db cache size 0
+  execsql {
+    pragma page_size=512;
+    pragma auto_vacuum=2;
+    pragma cache_size=16;
+  }
+}
+
+# Open two database connections and create a single table in the db.
+#
+do_test tkt2565-1.0 {
+  reopen_database
+  execsql { CREATE TABLE A(Id INTEGER, Name TEXT) }
+} {}
+
+for {set iFail 1} {$iFail<200} {incr iFail} {
+  reopen_database
+  execsql { pragma locking_mode=exclusive }
+  set nRow [db one {SELECT count(*) FROM a}]
+  
+  # Dirty (at least) one of the pages in the cache.
+  do_test tkt2565-1.$iFail.1 {
+    execsql {
+      BEGIN EXCLUSIVE;
+      INSERT INTO a VALUES(1, 'ABCDEFGHIJKLMNOP');
+    }
+  } {}
+  
+  # Now try to commit the transaction. Cause an IO error to occur
+  # within this operation, which moves the pager into the error state.
+  #
+  set ::sqlite_io_error_persist 1
+  set ::sqlite_io_error_pending $iFail
+  do_test tkt2565-1.$iFail.2 {
+    set rc [catchsql {COMMIT}]
+    list
+  } {}
+  set ::sqlite_io_error_persist 0
+  set ::sqlite_io_error_pending 0
+  if {!$::sqlite_io_error_hit} break
+  set ::sqlite_io_error_hit 0
+}
+
+# Make sure this test script doesn't leave any files open.
+#
+do_test tkt2565-1.X {
+  catch { db close }
+  set sqlite_open_file_count
+} 0
+
+# Restore the pcache configuration for subsequent tests.
+#
+sqlite3_shutdown
+sqlite3_config_alt_pcache 0
+
+finish_test