From: drh <drh@noemail.net>
Date: Mon, 2 Jan 2017 19:02:20 +0000 (+0000)
Subject: Provide the SQLITE_DEFAULT_LOOKASIDE compile-time option and make it's default
X-Git-Tag: version-3.17.0~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56d65cd7b98532849f1abe83fd6a1ba535b6adf5;p=thirdparty%2Fsqlite.git

Provide the SQLITE_DEFAULT_LOOKASIDE compile-time option and make it's default
value be 1200,100 (raised from 512,125 in the latest release).

FossilOrigin-Name: 584da48f9e818f25134e0a62fb7e84f07019511f
---

diff --git a/manifest b/manifest
index ceb0cb0d6e..e54d5c38a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sSQLITE_DEFAULT_PCACHE_INITSZ\sfrom\s100\sto\s20,\swhich\sis\sexperimentally\ndetermined\sto\sbe\sslightly\sfaster.
-D 2017-01-02T18:40:03.649
+C Provide\sthe\sSQLITE_DEFAULT_LOOKASIDE\scompile-time\soption\sand\smake\sit's\sdefault\nvalue\sbe\s1200,100\s(raised\sfrom\s512,125\sin\sthe\slatest\srelease).
+D 2017-01-02T19:02:20.627
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -345,7 +345,7 @@ F src/expr.c 3b662f58b50ba12c004b2d9bd8d3ff5fddbbae7f
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c d8582ee91975975645f206db332c38f534b783ad
-F src/global.c dcdb89f30b7aa531c5660030af106bc5bc48ef2e
+F src/global.c 4a34512d82fc5aa13c802db06bcfff5e1d3de955
 F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
@@ -1541,7 +1541,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 cfb3158204628eb2fd170090a7f212df0e4ce6c9
-R 3819f84452eff5f7c73531633215c7e7
+P 12d9493cb29307aec65ceccc68e802e4d0f18112
+R 787ccf579b7b160280cc3d40eebe4332
 U drh
-Z 6e195a33776011226e5f03369118edd7
+Z 23c3cb021f3ef702d9251ac032d5cda4
diff --git a/manifest.uuid b/manifest.uuid
index dd50d9f15e..b189a075f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-12d9493cb29307aec65ceccc68e802e4d0f18112
\ No newline at end of file
+584da48f9e818f25134e0a62fb7e84f07019511f
\ No newline at end of file
diff --git a/src/global.c b/src/global.c
index ff6c7dba52..a105135561 100644
--- a/src/global.c
+++ b/src/global.c
@@ -169,6 +169,19 @@ const unsigned char sqlite3CtypeMap[256] = {
 # define SQLITE_STMTJRNL_SPILL (64*1024)
 #endif
 
+/*
+** The default lookaside-configuration, the format "SZ,N".  SZ is the
+** number of bytes in each lookaside slot (should be a multiple of 8)
+** and N is the number of slots.  The lookaside-configuration can be
+** 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);
+*/
+#ifndef SQLITE_DEFAULT_LOOKASIDE
+# define SQLITE_DEFAULT_LOOKASIDE 1200,100
+#endif
+
+
 /*
 ** The following singleton contains the global configuration for
 ** the SQLite library.
@@ -181,8 +194,7 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = {
    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
    0x7ffffffe,                /* mxStrlen */
    0,                         /* neverCorrupt */
-   512,                       /* szLookaside */
-   125,                       /* nLookaside */
+   SQLITE_DEFAULT_LOOKASIDE,  /* szLookaside, nLookaside */
    SQLITE_STMTJRNL_SPILL,     /* nStmtSpill */
    {0,0,0,0,0,0,0,0},         /* m */
    {0,0,0,0,0,0,0,0,0},       /* mutex */