Fix a failing test case in index5.test. Also tweak the way cache memory is divided...

FossilOrigin-Name: 8541dfb3bbdf63dc9ab304d8a0ab8b290cdc9d96

diff --git a/manifest b/manifest
index fd3281f6c5b6849aa0f5f26ef14dd68e84c8736a..1b392cbba7a0ec0264df37977267371f3deca408 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\senable\scompiling\susing\sVC6.
-D 2014-10-10T18:09:52.113
+C Fix\sa\sfailing\stest\scase\sin\sindex5.test.\sAlso\stweak\sthe\sway\scache\smemory\sis\sdivided\sbetween\sread-only\sand\sdirty\spages\swhen\susing\sSQLITE_CONFIG_PAGECACHE\sto\sreduce\sIO\sin\ssome\scases.
+D 2014-10-10T19:10:59.145
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -220,7 +220,7 @@ F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
 F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
 F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
-F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
+F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
 F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
@@ -631,7 +631,7 @@ F test/index.test 4d990005a67a36984e4f1a5f1bdccea8d08da4ee
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 55a90cff99834305e8141df7afaef39674b57062
 F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6
-F test/index5.test fc07c14193c0430814e7a08b5da46888ee795c33
+F test/index5.test 25b0b451aceed4ac5f7d49f856f6de7257470b3e
 F test/index6.test fb370966ac3cd0989053dd5385757b5c3e24ab6a
 F test/index7.test 917cf1e1c7439bb155abbeabec511b28945e157b
 F test/indexedby.test b2f22f3e693a53813aa3f50b812eb609ba6df1ec
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P cf291cbe9f49396f03cfca39c2e892f27f750107
-R 9d22f3b27c328e6d3cb49e4853606989
-U drh
-Z 2221fbb0fe2956ed5002647d0de83cc0
+P 9ee5686ab3b0bca8cabdf455c75bd9410cdc5378
+R a867243fa8e0f0e41c6d9028f2d48296
+U dan
+Z 113af8b0b8de7f680d672bce9ecfd1d0

diff --git a/manifest.uuid b/manifest.uuid
index 8d12ba50f3c232272c548ea3a4d9108a3cead37a..14bf033b2553fe345df6f3ad353ce64217ed5d1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ee5686ab3b0bca8cabdf455c75bd9410cdc5378
\ No newline at end of file
+8541dfb3bbdf63dc9ab304d8a0ab8b290cdc9d96
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index 9d15e8514c0c02ab1035ecf30fd6ebf8c3514ccf..a8c3217382a10b170f017a2648a8759e0dd28b5f 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -688,7 +688,7 @@ static SQLITE_NOINLINE PgHdr1 *pcache1FetchStage2(
   if( createFlag==1 && (
         nPinned>=pGroup->mxPinned
      || nPinned>=pCache->n90pct
-     || pcache1UnderMemoryPressure(pCache)
+     || (pcache1UnderMemoryPressure(pCache) && pCache->nRecyclable<nPinned)
   )){
     return 0;
   }

diff --git a/test/index5.test b/test/index5.test
index 7895391309de132e3129ec9e5d9de90d19e95285..e369d75717e48e6b0c26cc618f85b7183618e548 100644 (file)
--- a/test/index5.test
+++ b/test/index5.test
@@ -16,6 +16,9 @@ source $testdir/tester.tcl
 set ::testprefix index5
 
 do_test 1.1 {
+  if {[permutation]=="memsubsys1"} {
+    execsql { PRAGMA auto_vacuum = 0; }
+  }
   execsql {
     PRAGMA page_size = 1024;
     CREATE TABLE t1(x);
@@ -38,7 +41,7 @@ tvfs filter xWrite
 tvfs script write_cb
 proc write_cb {xCall file handle iOfst args} {
   if {[file tail $file]=="test.db"} {
-    lappend ::write_list [expr $iOfst/1024]
+    lappend ::write_list [expr $iOfst/1024 + 1]
   }
 }