From: drh <drh@noemail.net>
Date: Wed, 18 Apr 2018 14:48:08 +0000 (+0000)
Subject: Omit some code not used without SQLITE_ENABLE_SORTER_REFERENCES.  Improvements
X-Git-Tag: version-3.24.0~140^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbade8d1f6211fa912f9ccaf034d6708cf2355a4;p=thirdparty%2Fsqlite.git

Omit some code not used without SQLITE_ENABLE_SORTER_REFERENCES.  Improvements
to comments used for documentation.

FossilOrigin-Name: f3596ab9eb1168dc75202e6f79e12c67d518b3a0659a0a629c707f43990fa7cf
---

diff --git a/manifest b/manifest
index 20ac700cb5..4df9bedbe8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\slocal\svariable.
-D 2018-04-18T14:04:19.741
+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
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -435,10 +435,10 @@ F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 F src/btree.c 9eb9531c65346bbfccf5325384b7db1849daf4db6601dcfe21ba5c5b20623b64
 F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
-F src/build.c 850d831d98ceaad4b8d1ed1f487697e008150804ad284eff4fb41cb067561d8f
+F src/build.c 91d548027a54044851299e719d60d6a2b6eaf3e3274678098cb73a6ab8c0fa19
 F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c bd9da3f1ff21b432564a16ef0b154cff03585dc43742842e99c58907c6cb4bef
+F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48
 F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
@@ -455,7 +455,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 752740e4619416d4262f6e9e51cdb6af5965eb0c8e943832a5af77d41e2839c7
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
-F src/main.c 8f89ff60cd0c759bd6078fdf4db12a1fedcb93a214f13d545ba64c297429725e
+F src/main.c 10e3897f5d78cef6bcbd1eedc8ccc3fe9e9783d07e052d9d70e57364ded19274
 F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -493,7 +493,7 @@ F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 6cf4c11b2f258940acc289ea57eaae1fba16689ae62e3a09ebbc6487d440bf09
 F src/shell.c.in cc960721e56ebc1a78773bb5d2f5608b54275f945cbe49e4afe919d6888062a7
-F src/sqlite.h.in 51a98c2a112df85bd32eef1cbe0f89257180d64100efc85e6dac6fb1f93ff5cc
+F src/sqlite.h.in aa9bd3ae4a077c7002059cb418271abe52214b0227b2a734bc44736b24cbcc40
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
 F src/sqliteInt.h ad14bfeab6c1ada3aa1181c6cc14a3e6a8f24b35ad96a2daa3d11100a5267236
@@ -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 b25a7bb769b8397a00736bd922bd24b1200b2f82d36d42ecb4c3eb17efb4b84d
-R eba9a240e0de928e991f348803303439
+P 9afeb0c88b211e3ad90697778ec8ebb80f216fe7078c3a2f51651c35d3828746
+R 33406b12bca77020e0867e36a6f40300
 U drh
-Z 5d665bfe789699fa240c154efc829ec2
+Z 8662be91b6a3020051547b8fbdcb3aff
diff --git a/manifest.uuid b/manifest.uuid
index fc722f046d..5314eed86c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9afeb0c88b211e3ad90697778ec8ebb80f216fe7078c3a2f51651c35d3828746
\ No newline at end of file
+f3596ab9eb1168dc75202e6f79e12c67d518b3a0659a0a629c707f43990fa7cf
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 1287dd129f..b032ff9f2c 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1095,12 +1095,14 @@ void sqlite3AddColumn(Parse *pParse, Token *pName, Token *pType){
  
   if( pType->n==0 ){
     /* If there is no type specified, columns have the default affinity
-    ** 'BLOB' and a default size of 4 bytes. */
+    ** 'BLOB' with a default size of 4 bytes. */
     pCol->affinity = SQLITE_AFF_BLOB;
     pCol->szEst = 1;
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
     if( 4>=sqlite3GlobalConfig.szSorterRef ){
       pCol->colFlags |= COLFLAG_SORTERREF;
     }
+#endif
   }else{
     zType = z + sqlite3Strlen30(z) + 1;
     memcpy(zType, pType->z, pType->n);
@@ -1221,9 +1223,11 @@ char sqlite3AffinityType(const char *zIn, Column *pCol){
         v = 16;   /* BLOB, TEXT, CLOB -> r=5  (approx 20 bytes)*/
       }
     }
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
     if( v>=sqlite3GlobalConfig.szSorterRef ){
       pCol->colFlags |= COLFLAG_SORTERREF;
     }
+#endif
     v = v/4 + 1;
     if( v>255 ) v = 255;
     pCol->szEst = v;
diff --git a/src/ctime.c b/src/ctime.c
index 1877aee10a..da79f3a350 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -286,6 +286,9 @@ static const char * const sqlite3azCompileOpt[] = {
 #if SQLITE_ENABLE_SNAPSHOT
   "ENABLE_SNAPSHOT",
 #endif
+#if SQLITE_ENABLE_SORTER_REFERENCES
+  "ENABLE_SORTER_REFERENCES",
+#endif
 #if SQLITE_ENABLE_SQLLOG
   "ENABLE_SQLLOG",
 #endif
diff --git a/src/main.c b/src/main.c
index 7fd218cc6b..99e3e6f970 100644
--- a/src/main.c
+++ b/src/main.c
@@ -642,16 +642,16 @@ int sqlite3_config(int op, ...){
       break;
     }
 
-    case SQLITE_CONFIG_SORTERREF_SIZE: {
 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
+    case SQLITE_CONFIG_SORTERREF_SIZE: {
       int iVal = va_arg(ap, int);
       if( iVal<0 ){
         iVal = SQLITE_DEFAULT_SORTERREF_SIZE;
       }
       sqlite3GlobalConfig.szSorterRef = (u32)iVal;
-#endif /* SQLITE_ENABLE_SORTER_REFERENCES */
       break;
     }
+#endif /* SQLITE_ENABLE_SORTER_REFERENCES */
 
     default: {
       rc = SQLITE_ERROR;
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ed4cffeab2..02dc8944b9 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1940,10 +1940,12 @@ struct sqlite3_mem_methods {
 ** sorted records. However, if SQLite determines based on the declared type
 ** of a table column that its values are likely to be very large - larger
 ** than the configured sorter-reference size threshold - then a reference
-** is stored in each sorted records and the required column values loaded
+** is stored in each sorted record and the required column values loaded
 ** from the database as records are returned in sorted order. The default
 ** value for this option is to never use this optimization. Specifying a 
 ** negative value for this option restores the default behaviour.
+** This option is only available if SQLite is compiled with the
+** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */