| Index: third_party/sqlite/src/test/memsubsys1.test
|
| diff --git a/third_party/sqlite/src/test/memsubsys1.test b/third_party/sqlite/src/test/memsubsys1.test
|
| index 8524fdeb9b39ee33ab352b0663e485c16f66ea95..c24a8bf95db5ab72a372ae2616dc053b27183d61 100644
|
| --- a/third_party/sqlite/src/test/memsubsys1.test
|
| +++ b/third_party/sqlite/src/test/memsubsys1.test
|
| @@ -11,12 +11,20 @@
|
| #
|
| # This file contains tests of the memory allocation subsystem
|
| #
|
| -# $Id: memsubsys1.test,v 1.17 2009/07/18 14:36:24 danielk1977 Exp $
|
|
|
| set testdir [file dirname $argv0]
|
| source $testdir/tester.tcl
|
| sqlite3_reset_auto_extension
|
|
|
| +# This test assumes that no page-cache or scratch buffers are installed
|
| +# by default when a new database connection is opened. As a result, it
|
| +# will not work with the "memsubsys1" permutation.
|
| +#
|
| +if {[permutation] == "memsubsys1"} {
|
| + finish_test
|
| + return
|
| +}
|
| +
|
| # This procedure constructs a new database in test.db. It fills
|
| # this database with many small records (enough to force multiple
|
| # rebalance operations in the btree-layer and to require a large
|
| @@ -90,15 +98,10 @@ build_test_db memsubsys1-2 {PRAGMA page_size=1024}
|
| #show_memstats
|
| do_test memsubsys1-2.3 {
|
| set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
|
| - set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| - expr {
|
| - ($pg_used*1024 + $pg_ovfl) < $max_pagecache &&
|
| - ($pg_used*(1024+$xtra_size) + $pg_ovfl) >= $max_pagecache
|
| - }
|
| -} 1
|
| +} [expr ($AUTOVACUUM+$TEMP_STORE>=2)*1024]
|
| do_test memsubsys1-2.4 {
|
| set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| -} 19
|
| +} 20
|
| do_test memsubsys1-2.5 {
|
| set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
|
| } 0
|
| @@ -134,7 +137,7 @@ do_test memsubsys1-3.2.3 {
|
| } 2048
|
| do_test memsubsys1-3.2.4 {
|
| set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| -} 19
|
| +} 20
|
| do_test memsubsys1-3.2.5 {
|
| set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
|
| } 0
|
| @@ -151,15 +154,11 @@ build_test_db memsubsys1-4 {PRAGMA page_size=1024}
|
| #show_memstats
|
| do_test memsubsys1-4.3 {
|
| set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| -} 49
|
| + expr {$pg_used>=45 && $pg_used<=50}
|
| +} 1
|
| do_test memsubsys1-4.4 {
|
| set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
|
| - set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| - expr {
|
| - ($pg_used*1024 + $pg_ovfl) < $max_pagecache &&
|
| - ($pg_used*(1024+$xtra_size) + $pg_ovfl) >= $max_pagecache
|
| - }
|
| -} 1
|
| +} 0
|
| do_test memsubsys1-4.5 {
|
| set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
|
| expr {$maxreq<7000}
|
| @@ -181,7 +180,7 @@ build_test_db memsubsys1-5 {PRAGMA page_size=4096}
|
| #show_memstats
|
| do_test memsubsys1-5.3 {
|
| set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| -} 23
|
| +} 24
|
| do_test memsubsys1-5.4 {
|
| set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
|
| expr {$maxreq>4096}
|
| @@ -207,11 +206,11 @@ build_test_db memsubsys1-6 {PRAGMA page_size=4096}
|
| #show_memstats
|
| do_test memsubsys1-6.3 {
|
| set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
|
| -} 23
|
| -do_test memsubsys1-6.4 {
|
| - set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
|
| - expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
|
| -} 1
|
| +} 24
|
| +#do_test memsubsys1-6.4 {
|
| +# set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
|
| +# expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
|
| +#} 1
|
| do_test memsubsys1-6.5 {
|
| set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
|
| } 1
|
|
|