Simplify the pcache module by only recycling clean pages from 'other' caches. This commit causes errors in test files ioerr5.test and malloc5.test because they test recycling dirty pages from other caches. (CVS 5615)

FossilOrigin-Name: 9e511e161bcb077450d31fca5dd20c2557f103b3
This commit is contained in:
danielk1977
2008-08-26 18:05:48 +00:00
parent 1a4e3162d9
commit d491e1bfd1
8 changed files with 227 additions and 351 deletions
+3 -3
View File
@@ -11,7 +11,7 @@
#
# This file contains tests of the memory allocation subsystem
#
# $Id: memsubsys1.test,v 1.10 2008/08/20 14:49:25 danielk1977 Exp $
# $Id: memsubsys1.test,v 1.11 2008/08/26 18:05:48 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -228,10 +228,11 @@ sqlite3_shutdown
sqlite3_config_pagecache [expr 4096+$xtra_size] 24
sqlite3_config_scratch 25000 1
sqlite3_initialize
pcache_global_max 15
reset_highwater_marks
build_test_db memsubsys1-7 {
PRAGMA page_size=4096;
PRAGMA cache_size=10;
PRAGMA temp_store=memory;
}
#show_memstats
do_test memsubsys1-7.3 {
@@ -251,7 +252,6 @@ do_test memsubsys1-7.6 {
do_test memsubsys1-7.7 {
set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
} 0
pcache_global_max 0
db close
sqlite3_shutdown
+1 -5
View File
@@ -16,7 +16,7 @@
# any statement other than a COMMIT, an I/O error is returned instead
# of SQLITE_BUSY.
#
# $Id: tkt2409.test,v 1.4 2008/08/20 14:49:25 danielk1977 Exp $
# $Id: tkt2409.test,v 1.5 2008/08/26 18:05:48 danielk1977 Exp $
# Test Outline:
#
@@ -79,8 +79,6 @@ proc unread_lock_db {} {
}
}
pcache_global_max 10
# Open the db handle used by [read_lock_db].
#
sqlite3 db2 test.db
@@ -223,8 +221,6 @@ do_test tkt2409-4.4 {
catchsql { ROLLBACK }
} {0 {}}
pcache_global_max 0
unread_lock_db
db2 close
unset -nocomplain t1