From: drh <drh@noemail.net>
Date: Wed, 18 Apr 2018 15:21:13 +0000 (+0000)
Subject: Add the --sorterref N option to the CLI.
X-Git-Tag: version-3.24.0~140^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a90d84fe211178c757f9d74430f8b589a0438fe8;p=thirdparty%2Fsqlite.git

Add the --sorterref N option to the CLI.

FossilOrigin-Name: 902a40897f74ac8a3bc72ef84c2161ab308b5601381cc9eea18147bfefa978ce
---

diff --git a/manifest b/manifest
index 4df9bedbe8..b89a9e6a13 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\ssome\scode\snot\sused\swithout\sSQLITE_ENABLE_SORTER_REFERENCES.\s\sImprovements\nto\scomments\sused\sfor\sdocumentation.
-D 2018-04-18T14:48:08.814
+C Add\sthe\s--sorterref\sN\soption\sto\sthe\sCLI.
+D 2018-04-18T15:21:13.476
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -492,7 +492,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 6cf4c11b2f258940acc289ea57eaae1fba16689ae62e3a09ebbc6487d440bf09
-F src/shell.c.in cc960721e56ebc1a78773bb5d2f5608b54275f945cbe49e4afe919d6888062a7
+F src/shell.c.in 6c9e2c1136f3697eb75f5dce010e7af005f62b4e1fda6d1066c3a473eb922889
 F src/sqlite.h.in aa9bd3ae4a077c7002059cb418271abe52214b0227b2a734bc44736b24cbcc40
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
@@ -1718,7 +1718,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 9afeb0c88b211e3ad90697778ec8ebb80f216fe7078c3a2f51651c35d3828746
-R 33406b12bca77020e0867e36a6f40300
+P f3596ab9eb1168dc75202e6f79e12c67d518b3a0659a0a629c707f43990fa7cf
+R 0443c59f405eaa117ee330ad90988b78
 U drh
-Z 8662be91b6a3020051547b8fbdcb3aff
+Z 0415bd978b9c9d919a9a079609154b94
diff --git a/manifest.uuid b/manifest.uuid
index 5314eed86c..038423a21c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3596ab9eb1168dc75202e6f79e12c67d518b3a0659a0a629c707f43990fa7cf
\ No newline at end of file
+902a40897f74ac8a3bc72ef84c2161ab308b5601381cc9eea18147bfefa978ce
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index ddbf825951..9750cf2803 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8076,6 +8076,9 @@ static const char zOptions[] =
   "   -quote               set output mode to 'quote'\n"
   "   -readonly            open the database read-only\n"
   "   -separator SEP       set output column separator. Default: '|'\n"
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
+  "   -sorterref SIZE      sorter references threshold size\n"
+#endif
   "   -stats               print memory stats before each finalize\n"
   "   -version             show SQLite version\n"
   "   -vfs NAME            use NAME as the default VFS\n"
@@ -8331,6 +8334,11 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     }else if( strcmp(z,"-mmap")==0 ){
       sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
       sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
+    }else if( strcmp(z,"-sorterref")==0 ){
+      sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
+      sqlite3_config(SQLITE_CONFIG_SORTERREF_SIZE, (int)sz);
+#endif
     }else if( strcmp(z,"-vfs")==0 ){
       sqlite3_vfs *pVfs = sqlite3_vfs_find(cmdline_option_value(argc,argv,++i));
       if( pVfs ){
@@ -8467,6 +8475,10 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       i+=2;
     }else if( strcmp(z,"-mmap")==0 ){
       i++;
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
+    }else if( strcmp(z,"-sorterref")==0 ){
+      i++;
+#endif
     }else if( strcmp(z,"-vfs")==0 ){
       i++;
 #ifdef SQLITE_ENABLE_VFSTRACE