Get autovacuum and in-memory databases working together. Ticket #1727. (CVS 3148)

FossilOrigin-Name: 21446df6420df00468867f1131c28604a1ae91a3

diff --git a/manifest b/manifest
index 156cd68e23a90cab0fbb23be7a1c742a4a88df5c..e26e3cc31057f354f4ad09534a60a28b56de5c5b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\spread()/pwrite()\sinterface\son\sPosix\sif\scompiled\swith\s-DUSE_PREAD=1.\nNote\sthat\son\sLinux\sthis\sis\sslower\sand\sdoes\snot\swork\sfor\slarge\sfiles.\s(CVS\s3147)
-D 2006-03-23T22:42:20
+C Get\sautovacuum\sand\sin-memory\sdatabases\sworking\stogether.\s\sTicket\s#1727.\s(CVS\s3148)
+D 2006-03-23T23:29:04
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -59,7 +59,7 @@ F src/os_unix.c 35ad4d81c90800f509d28580742b67906d289223
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 8ced9ac82670bbf77492961a2f7ff80a87f1404f
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 0e5a3d1e7e6822e731da4ea90eedff3c7857ddc9
+F src/pager.c 0b34f79119dfd302e371f5f172f434613336ca67
 F src/pager.h 43f32f3847421f7502cfbb66f4eb2302b8033818
 F src/parse.y ee1887ce0e6eea15cc728913ad3462898f88e9b0
 F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55
@@ -113,7 +113,7 @@ F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe
 F test/attachmalloc.test cdb26c42850f04698377ccec05f5fa89d987837c
 F test/auth.test 9776ab43de94801f0fa6787b3f3e803686ffa0ff
 F test/autoinc.test 60005a676e3e4e17dfa9dbd08aa0b76587ff97e3
-F test/autovacuum.test 0dd22b0e1fe2013abe03e2ef5000bb3b9c1b6666
+F test/autovacuum.test 12bb130cf7ee5b9cf9672bc82655b5f4391e1d15
 F test/autovacuum_crash.test 05a63b8805b20cfba7ace82856ce4ccdda075a31
 F test/autovacuum_ioerr.test c46a76869cb6eddbbb40b419b2b6c4c001766b1f
 F test/autovacuum_ioerr2.test 2f8a3fb31f833fd0ca86ad4ad98913c73e807572
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 01e164da67fde3a89abeadd5973ead7a74e23a51
-R 5cbb3e3897611b57c9aea56a412ade76
+P 5a24f61981df4d8b696f03372eba2d37228906d9
+R 750982574ed29edef07cf0a26cbd5a70
 U drh
-Z 617ee67652f0c5592bd9cf08ec1103f6
+Z ec805b2d5215633dd615b072bbda2925

diff --git a/manifest.uuid b/manifest.uuid
index c04336c7f6c1489b3f94d96fd672c9016b6be6c1..727b63ea0d4008b38ba9049d69c172fc38686ac2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a24f61981df4d8b696f03372eba2d37228906d9
\ No newline at end of file
+21446df6420df00468867f1131c28604a1ae91a3
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 7e77048fefcfa455542d43e44638fc1682154c49..e23bc0538ab91be86fa84aeb0131c15e365a1c61 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.263 2006/03/16 16:19:56 drh Exp $
+** @(#) $Id: pager.c,v 1.264 2006/03/23 23:29:04 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1833,7 +1833,10 @@ static void unlinkHashChain(Pager *pPager, PgHdr *pPg){
     assert( pPager->aHash[h]==pPg );
     pPager->aHash[h] = pPg->pNextHash;
   }
-
+  if( MEMDB ){
+    static void clearHistory(PgHistory*);  /* Forward reference */
+    clearHistory(PGHDR_TO_HIST(pPg, pPager));
+  }
   pPg->pgno = 0;
   pPg->pNextHash = pPg->pPrevHash = 0;
 }
@@ -3242,6 +3245,7 @@ int sqlite3pager_commit(Pager *pPager){
       pPg->dirty = 0;
       pPg->inJournal = 0;
       pPg->inStmt = 0;
+      pPg->needSync = 0;
       pPg->pPrevStmt = pPg->pNextStmt = 0;
       pPg = pPg->pDirty;
     }
@@ -3656,6 +3660,8 @@ int sqlite3pager_sync(Pager *pPager, const char *zMaster, Pgno nTrunc){
     }
 
     pPager->state = PAGER_SYNCED;
+  }else if( MEMDB && nTrunc!=0 ){
+    rc = sqlite3pager_truncate(pPager, nTrunc);
   }
 
 sync_exit:

diff --git a/test/autovacuum.test b/test/autovacuum.test
index c71ba8114c38c9e130e74073d99cea1710114616..30694349674688d609d0d00d6410e6d856dbd576 100644 (file)
--- a/test/autovacuum.test
+++ b/test/autovacuum.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the SELECT statement.
 #
-# $Id: autovacuum.test,v 1.20 2006/01/16 16:24:25 danielk1977 Exp $
+# $Id: autovacuum.test,v 1.21 2006/03/23 23:29:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -525,4 +525,17 @@ do_test autovacuum-4.4 {
   }
 } {}
 
+# Ticket #1727
+do_test autovacuum-5.1 {
+  db close
+  sqlite3 db :memory:
+  db eval {
+    PRAGMA auto_vacuum=1;
+    CREATE TABLE t1(a);
+    CREATE TABLE t2(a);
+    DROP TABLE t1;
+    PRAGMA integrity_check;
+  }
+} ok
+
 finish_test