Increase the hard upper bound on the number of pcache pages in test_pcache

when the test harness is compiled for in-memory temp tables.  Some of the
test cases need to extra memory to avoid unplanned out of memory errors. (CVS 6494)

FossilOrigin-Name: 7f2d6a0bd510801e011eb075f494194d9ebf568b

diff --git a/manifest b/manifest
index 9f509522d53906fc4b422e213be01cc9c4dc01db..7dad2d81408e4ad6869a93e632735250ab90ec3f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sinvocation\sof\s(really_finish_test)\sfrom\sasync.test\swith\s(finish_test).\sOtherwise\sa\stcl\sexception\smay\sbe\sthrown\swhen\srunning\spermutations.\s(CVS\s6493)
-D 2009-04-11T10:25:04
+C Increase\sthe\shard\supper\sbound\son\sthe\snumber\sof\spcache\spages\sin\stest_pcache\nwhen\sthe\stest\sharness\sis\scompiled\sfor\sin-memory\stemp\stables.\s\sSome\sof\sthe\ntest\scases\sneed\sto\sextra\smemory\sto\savoid\sunplanned\sout\sof\smemory\serrors.\s(CVS\s6494)
+D 2009-04-11T11:38:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -188,7 +188,7 @@ F src/test_md5.c 032ae2bb6f81da350d2404e81fa8d560c8268026
 F src/test_mutex.c 482d9d987c1c678199691efc23c8cd3464e01ff5
 F src/test_onefile.c d2c3126633592aeef14e8d268fc40c74449b69d8
 F src/test_osinst.c 9a70a61e127f9e72bcfca000b20368b1c5367873
-F src/test_pcache.c 29464896d9c67832e4eef916c0682b98d7283d00
+F src/test_pcache.c d770f933888b2afe856c1abcefc64eda5941ffef
 F src/test_schema.c 4b4bf7bb329326458c491b0e6facd4c8c4c5b479
 F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 4447c94f45b8abd833eb82b67233029088fd1a54
-R 4bd554f3a722f52dd92651334aebb128
-U danielk1977
-Z 42a24e3c74bfe026f17c04d99d336776
+P e6465e9da3d754833c21e0fb76c16a4efd047b91
+R 12b7e2f32706b065defda74b069075b3
+U drh
+Z bc5ee0b397d91a11927e825c3066199f

diff --git a/manifest.uuid b/manifest.uuid
index d238f7b6be3f0ce2aab00808fc387d8482f03b56..07b621a87dab90bb02dffbd77f13e27b10d0c6ce 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6465e9da3d754833c21e0fb76c16a4efd047b91
\ No newline at end of file
+7f2d6a0bd510801e011eb075f494194d9ebf568b
\ No newline at end of file

diff --git a/src/test_pcache.c b/src/test_pcache.c
index 05bc8f7e4c8dc68c653cee1e83f1500d52d4a928..dfef14192a783d30086d8329b3fd050519302ddc 100644 (file)
--- a/src/test_pcache.c
+++ b/src/test_pcache.c
@@ -21,7 +21,7 @@
 ** This pagecache implementation is designed for simplicity
 ** not speed.  
 **
-** $Id: test_pcache.c,v 1.2 2009/01/07 03:59:47 drh Exp $
+** $Id: test_pcache.c,v 1.3 2009/04/11 11:38:54 drh Exp $
 */
 #include "sqlite3.h"
 #include <string.h>
@@ -75,9 +75,19 @@ static void testpcacheShutdown(void *pArg){
 }
 
 /*
-** Number of pages in a cache
+** Number of pages in a cache.
+**
+** The number of pages is a hard upper bound in this test module.
+** If more pages are requested, sqlite3PcacheFetch() returns NULL.
+**
+** If testing with in-memory temp tables, provide a larger pcache.
+** Some of the test cases need this.
 */
-#define TESTPCACHE_NPAGE    217
+#if defined(SQLITE_TEMP_STORE) && SQLITE_TEMP_STORE>=2
+# define TESTPCACHE_NPAGE    499
+#else
+# define TESTPCACHE_NPAGE    217
+#endif
 #define TESTPCACHE_RESERVE   17
 
 /*