Fix a compiler warning in pcache1. Reduce the maximum size of a pcache1

cache to 2147418112 pages.

FossilOrigin-Name: 4bc93658aa563f2fa84f7f85f7f9f336dc80425640140c0fc2aec4a3606fad48

diff --git a/manifest b/manifest
index 969df8ecab1d1bbe6d69486432b3d6c827897b5a..fb93aee99c2e3134c6e5a2445fed1098e05b7327 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\simprovements\sto\sthe\seOpenState\sbit\svalues.
-D 2021-08-09T18:13:38.173
+C Fix\sa\scompiler\swarning\sin\spcache1.\s\sReduce\sthe\smaximum\ssize\sof\sa\spcache1\ncache\sto\s2147418112\spages.
+D 2021-08-09T19:54:27.186
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -536,7 +536,7 @@ F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 F src/parse.y 0ba0baec5de6921ec8ba8bbcf1018969144ef29d26112e17539d8fbb1662e3eb
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
-F src/pcache1.c 00541fef31d2798dc20308ee1fa46205b76ad1df2c871e9c9bfe9508e59ab54c
+F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
 F src/pragma.c af0f43789545622fd5377d71f6d4c0e7c9b9295a3f5d5b1242e4032d38ca12b5
 F src/pragma.h a11b4798f9c49f156f130e1f7041a9fcc9d316a64f3501b6013acdd2e4c6f549
 F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
@@ -1920,7 +1920,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bf9d70fc2fde06a3f132270a26d4abe321687169066aff26ad9e92757c7f9ee4
-R a9151e310251de143fbd3b8abd808680
-U mistachkin
-Z e0914599a10f85fbe60bdb3fef5eb7e0
+P d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
+R 19e90c8b9bdd61fd7709a8e960a3ede7
+U drh
+Z 8656b513dcc008313098af5e52544bda

diff --git a/manifest.uuid b/manifest.uuid
index b870135606872aafbf88428a6c8d220e24da092c..8f201ac54b5e546a0dbff686753da4650b2174e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
\ No newline at end of file
+4bc93658aa563f2fa84f7f85f7f9f336dc80425640140c0fc2aec4a3606fad48
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index 286a98d36a9f01d5e0aac8665c3eb9a8d318a34c..a93b146894f154f5d822f2cf02a766c0b2032995 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -817,15 +817,18 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
 */
 static void pcache1Cachesize(sqlite3_pcache *p, int nMax){
   PCache1 *pCache = (PCache1 *)p;
+  u32 n;
+  assert( nMax>=0 );
   if( pCache->bPurgeable ){
     PGroup *pGroup = pCache->pGroup;
     pcache1EnterMutex(pGroup);
-    if( nMax > 0xffff0000 - pGroup->nMaxPage + pCache->nMax ){
-      nMax = 0xffff0000 - pGroup->nMaxPage + pCache->nMax;
+    n = (u32)nMax;
+    if( n > 0x7fff0000 - pGroup->nMaxPage + pCache->nMax ){
+      n = 0x7fff0000 - pGroup->nMaxPage + pCache->nMax;
     }
-    pGroup->nMaxPage += (nMax - pCache->nMax);
+    pGroup->nMaxPage += (n - pCache->nMax);
     pGroup->mxPinned = pGroup->nMaxPage + 10 - pGroup->nMinPage;
-    pCache->nMax = nMax;
+    pCache->nMax = n;
     pCache->n90pct = pCache->nMax*9/10;
     pcache1EnforceMaxPage(pCache);
     pcache1LeaveMutex(pGroup);