Added new tests of the scratch memory allocator for increased test coverage. (CVS...

FossilOrigin-Name: e99e28efbbfff3e46eec0f90d566991de4406fd8

diff --git a/manifest b/manifest
index a43da9f5260eaad758d30b4a4753b6d16a161002..423e28f3ba28187e170183ba73583a6598a3a5cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\stest\svfs\sin\stest_journal.c\szeroes\ssqlite3_file.pMethods\sif\san\sxOpen()\scall\sfails.\sSimilar\sproblem\sto\sthat\sfixed\sby\s#6384.\sThis\swas\sa\sproblem\swith\stest\scode,\snot\sSQLite\sitself.\s(CVS\s6387)
-D 2009-03-26T11:49:11
+C Added\snew\stests\sof\sthe\sscratch\smemory\sallocator\sfor\sincreased\stest\scoverage.\s(CVS\s6388)
+D 2009-03-26T12:20:33
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -462,7 +462,7 @@ F test/malloc_common.tcl 984baeb6c6b185e798827d1187d426acc2bc4962
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 09240c19e95b063e193b95d6e3eb99f528fbc2dd
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test bdc24a38d198679d777ca4efcc089fd3948567a6
+F test/memsubsys1.test 9ce051c7b8311e7bc1cf4a66b519a6dddc639fa5
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8589b0fcc51a32188386e442655fd91f421ca7f8
-R d3bafa860788dd3cbdc932b740db01e6
-U danielk1977
-Z 37170d0fa4349c466fb7ae22908082e4
+P 45ae830d5631afa5d994361f5122c2f0b6fbab4c
+R 8521a21fe65240700eb1d33418df1449
+U drh
+Z 4dc7df9ab0325fa37fcacdb293c3bd9a

diff --git a/manifest.uuid b/manifest.uuid
index dcf08e7a270b46416a74a78eb18315aa86edc974..d05809e27aa9c8340fa8c1420e9137feb52c84e8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45ae830d5631afa5d994361f5122c2f0b6fbab4c
\ No newline at end of file
+e99e28efbbfff3e46eec0f90d566991de4406fd8
\ No newline at end of file

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 849c404a077cc1c3f4ee6ce48284c3d99b6d84b5..777cb8becdd41a1719b8c8f23e8f5aedb200259c 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -11,7 +11,7 @@
 #
 # This file contains tests of the memory allocation subsystem
 #
-# $Id: memsubsys1.test,v 1.13 2008/10/01 13:55:51 drh Exp $
+# $Id: memsubsys1.test,v 1.14 2009/03/26 12:20:33 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -253,8 +253,54 @@ do_test memsubsys1-7.7 {
   set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
 } 0
 
+# Test 8:  Disable PAGECACHE.  Make available SCRATCH zero.  Verify that
+# the SCRATCH overflow logic works.
+#
+db close
+sqlite3_shutdown
+sqlite3_config_pagecache 0 0
+sqlite3_config_scratch 25000 0
+sqlite3_initialize
+reset_highwater_marks
+do_test memsubsys1-8.1 {
+  set pg_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
+} 0
+do_test memsubsys1-8.2 {
+  set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
+} 0
+do_test memsubsys1-8.3 {
+  sqlite3 db :memory:
+  db eval {
+    CREATE TABLE t1(x);
+    INSERT INTO t1 VALUES(zeroblob(400));
+    INSERT INTO t1 VALUES(zeroblob(400));
+    INSERT INTO t1 SELECT * FROM t1;
+    INSERT INTO t1 SELECT * FROM t1;
+    INSERT INTO t1 SELECT * FROM t1;
+  }
+  expr {[lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]>0}
+} 1
+db close
+sqlite3_shutdown
+sqlite3_config_memstatus 0
+sqlite3_initialize
+do_test memsubsys1-8.4 {
+  sqlite3 db :memory:
+  db eval {
+    CREATE TABLE t1(x);
+    INSERT INTO t1 VALUES(zeroblob(400));
+    INSERT INTO t1 VALUES(zeroblob(400));
+    INSERT INTO t1 SELECT * FROM t1;
+    INSERT INTO t1 SELECT * FROM t1;
+    INSERT INTO t1 SELECT * FROM t1;
+    SELECT rowid FROM t1;
+  }
+} {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16}
+
+
 db close
 sqlite3_shutdown
+sqlite3_config_memstatus 1
 sqlite3_config_pagecache 0 0
 sqlite3_config_scratch 0 0
 sqlite3_config_lookaside 100 500