diff --git a/manifest b/manifest index 6425c9f1a0..16e83f5bd7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cleanup\sand\sperformance\senhancements\sfor\smini-lookaside. -D 2019-12-13T15:48:21.644 +C Change\sthe\sdefault\slookaside\sconfiguration\sto\s40\sslots\sof\s1200-bytes\seach.\nThis\sactually\sworks\sout\sto\s30\sbig\sslots\sand\s93\ssmall\sslots\susing\sthe\s\nmini-lookaside\sallocator.\s\sWe\sget\sthe\ssame\s(or\sbetter)\slookaside\scoverage\nbut\swith\s72KB\sless\smemory\sper\sconnection. +D 2019-12-13T16:04:52.502 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -483,7 +483,7 @@ F src/expr.c a4c16d4eed1508377bb8aba71471f3f023edb2ebd79fb7ba3bf379b1e54a6cb7 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12 -F src/global.c a1a8d698762ddd9a1543aac26c1e0029b20fcc3fcb56bfa41ec8cea2368f2798 +F src/global.c 76da82a621fed40105172969f1a4af93bdab107fa07426f532502c498cf81eb8 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144 @@ -1852,7 +1852,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 9c471195f6d3e4b00e2d0f909b306a4036352082dca5f016a8eece226e82163d -R 40d26fbfedcb39151f8726a7fa468e8a +P 74805668430051032ae9b256c84e252755ee03075fc08293c948675ed40ec280 +R be744340ad93a72a39e7a253bc678105 U drh -Z 7742eaad4b11604e1540b9f51bda9209 +Z cd1e4565dc6a4c9271072cb91752ff19 diff --git a/manifest.uuid b/manifest.uuid index 4e1f2b833d..5fd4b18240 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -74805668430051032ae9b256c84e252755ee03075fc08293c948675ed40ec280 \ No newline at end of file +47b71a84d1262c4bf6ad4f4a91820fd63593f08ae9efa144199d44972225e073 \ No newline at end of file diff --git a/src/global.c b/src/global.c index 4689e94bb4..570002be4d 100644 --- a/src/global.c +++ b/src/global.c @@ -190,9 +190,18 @@ const unsigned char sqlite3CtypeMap[256] = { ** changed as start-time using sqlite3_config(SQLITE_CONFIG_LOOKASIDE) ** or at run-time for an individual database connection using ** sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE); +** +** With the mini-lookaside enhancement, must less lookaside is required. +** The default configuration of 1200,40 actually proves 30 1200-byte slots +** and 93 128-byte slots, which is more lookaside slots that are available +** using the older 1200,100 configuration without mini-lookaside. */ #ifndef SQLITE_DEFAULT_LOOKASIDE -# define SQLITE_DEFAULT_LOOKASIDE 1200,100 +# ifdef SQLITE_OMIT_MINI_LOOKASIDE +# define SQLITE_DEFAULT_LOOKASIDE 1200,100 /* 120KB of memory */ +# else +# define SQLITE_DEFAULT_LOOKASIDE 1200,40 /* 48KB of memory */ +# endif #endif