From: drh <drh@noemail.net>
Date: Sat, 23 Jan 2016 22:55:53 +0000 (+0000)
Subject: Add the SQLITE_SPELLFIX_STACKALLOC_SZ compile-time option to control how much
X-Git-Tag: version-3.11.0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9084ec1d962388a219d32fbed684f15e44de11d8;p=thirdparty%2Fsqlite.git

Add the SQLITE_SPELLFIX_STACKALLOC_SZ compile-time option to control how much
stack space is available for use as the Wagner matrix in editDest3 of the
spellfix extension.

FossilOrigin-Name: dd0100dd87e2c7c70fabb2d3188f0906e605583d
---

diff --git a/ext/misc/spellfix.c b/ext/misc/spellfix.c
index d17a05a3cd..68bd2afbb2 100644
--- a/ext/misc/spellfix.c
+++ b/ext/misc/spellfix.c
@@ -875,6 +875,17 @@ static void updateCost(
   }
 }
 
+/*
+** How much stack space (int bytes) to use for Wagner matrix in 
+** editDist3Core().  If more space than this is required, the entire
+** matrix is taken from the heap.  To reduce the load on the memory
+** allocator, make this value as large as practical for the
+** architecture in use.
+*/
+#ifndef SQLITE_SPELLFIX_STACKALLOC_SZ
+# define SQLITE_SPELLFIX_STACKALLOC_SZ  (1024)
+#endif
+
 /* Compute the edit distance between two strings.
 **
 ** If an error occurs, return a negative number which is the error code.
@@ -904,7 +915,7 @@ static int editDist3Core(
   EditDist3Cost *p;
   int res;
   sqlite3_uint64 nByte;
-  unsigned int stackSpace[16*1024];
+  unsigned int stackSpace[SQLITE_SPELLFIX_STACKALLOC_SZ/sizeof(unsigned int)];
 
   /* allocate the Wagner matrix and the aTo[] array for the TO string */
   n = (f.n+1)*(n2+1);
diff --git a/manifest b/manifest
index 8a5302c683..d6adb98190 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sspellfix\sto\stry\sto\sget\sit\sto\suse\sstack\sspace\sinstead\sof\sheap\sspace\nin\scases\swhere\sthat\smakes\ssense.
-D 2016-01-23T18:24:52.238
+C Add\sthe\sSQLITE_SPELLFIX_STACKALLOC_SZ\scompile-time\soption\sto\scontrol\show\smuch\nstack\sspace\sis\savailable\sfor\suse\sas\sthe\sWagner\smatrix\sin\seditDest3\sof\sthe\nspellfix\sextension.
+D 2016-01-23T22:55:53.451
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
@@ -210,7 +210,7 @@ F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
 F ext/misc/series.c b8fb7befd85b3a9b4a10e701b30b2b79ca92b6d4
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
-F ext/misc/spellfix.c 5850a0e05ae1eacd48a3d80991c63b58d41e2d27
+F ext/misc/spellfix.c db4cc4b7aa12384e6c19a289a39cd232d355413d
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
@@ -1419,7 +1419,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3be336aa893f9eb0837d7d66c83bab1489792b9a
-R e0cc5654cf9d372268674d3acd0d1178
+P dfcebc7393a3a780ee9c4f257723c303bb633064
+R f2b384711e45db4261b5ef34d3e09d67
 U drh
-Z 5f4045218ee81aac454594c9cbaf4e94
+Z 57efa8447e9c944d8afed12c4b4dd5da
diff --git a/manifest.uuid b/manifest.uuid
index ff35bf94f1..dfbb1735b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dfcebc7393a3a780ee9c4f257723c303bb633064
\ No newline at end of file
+dd0100dd87e2c7c70fabb2d3188f0906e605583d
\ No newline at end of file