Add option 2 to SQLITE_TESTCTRL_USELONGDOUBLE to move the setting to its

defaults.  Enhance the CLI and testfixture to make use of this value.
Base the default on sizeof(LONGDOUBLE_TYPE) rather than on sizeof(long double).

FossilOrigin-Name: 64e6bd1c25d8e1dbfe511cba1921ff052c0fa4fe410fc9ce4435700a70cb88b1

diff --git a/manifest b/manifest
index 6ec243f0480a677590ae7b217b0165b0cf3ff2e8..b00b7b5eccfe8619a4cc55eb94c217a14934bcca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\shandling\sof\sinteger\sinputs\sto\sthe\snew\ssum()\simplementation.
-D 2023-07-06T20:34:06.486
+C Add\soption\s2\sto\sSQLITE_TESTCTRL_USELONGDOUBLE\sto\smove\sthe\ssetting\sto\sits\ndefaults.\s\sEnhance\sthe\sCLI\sand\stestfixture\sto\smake\suse\sof\sthis\svalue.\nBase\sthe\sdefault\son\ssizeof(LONGDOUBLE_TYPE)\srather\sthan\son\ssizeof(long\sdouble).
+D 2023-07-07T12:08:22.335
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -591,7 +591,7 @@ F src/expr.c 8d1656b65e26af3e34f78e947ac423f0d20c214ed25a67486e433bf16ca6b543
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
 F src/func.c b2325dc2fb0b43874fa5f2ae4e83262bdda952fc317b294dfca5ce70d5049bcd
-F src/global.c a16553245e315ee0cda8f9b0bf744efef9dc99f86e9d77f58975ea58824ded92
+F src/global.c 29f56a330ed9d1b5cd9b79ac0ca36f97ac3afc730ff8bfa987b0db9e559d684d
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
@@ -600,7 +600,7 @@ F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
 F src/json.c 14c474fb1249a46eb44e878e2361f36abfe686b134039b0d1883d93d61505b4a
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
-F src/main.c 7bc04e53851c813454b73083e21f84fd8a6d3d32eaa242bb4974eda870e28fef
+F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -638,7 +638,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 3ab1186290a311a8ceed1286c0e286209f7fe97b2d02c7593258004ce295dd88
-F src/shell.c.in e01d7e1d8a6b158320c97c955e1b14763289b82a73e3a155fa8efe0d546f0567
+F src/shell.c.in d320d8a13636de06d777cc1eab981caca304e175464e98183cf4ea68d93db818
 F src/sqlite.h.in f999ef3642f381d69679b2516b430dbcb6c5a2a951b7f5e43dc4751b474a5774
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -647,7 +647,7 @@ F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
-F src/test1.c 86099cc02f22069d75b04ae9c105acde0edbce9033d5ac37262bad2e461e6000
+F src/test1.c 9111b12427b3b94429aff68bbcf5b125ae70438f6ce2f3f033e2a69626ec26c9
 F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef
 F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -2043,8 +2043,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8813317cb52990d90bd48de163b6e35ddcad2b6f3187aa28b28e2e088b4489ce
-R 9348b4da86b2dc5770e5a3e29f969bb8
+P 31561c63bde6af2210296810fd66232b935033b4d26273a6b8a52142c54b4e12
+R 93932f9b54cd2edf248071527cdd4d5f
 U drh
-Z 9ba3e2bfbcb059fcdee5f10217aa5809
+Z ab5ae8b4443bc292d3ee2bd813aeff61
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 137c0ea88d0c177a54b116db32825395f59f4681..05d3f3bfbdf4ec844e04aa197756ec6fba2dd818 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31561c63bde6af2210296810fd66232b935033b4d26273a6b8a52142c54b4e12
\ No newline at end of file
+64e6bd1c25d8e1dbfe511cba1921ff052c0fa4fe410fc9ce4435700a70cb88b1
\ No newline at end of file

diff --git a/src/global.c b/src/global.c
index dc765522ec51c05a3f6cf3e5e0db88ffe3a6d695..60cd13e2ab9c3f717af637bc08be053ba4c0aef4 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -243,7 +243,7 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = {
    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
    0,                         /* bSmallMalloc */
    1,                         /* bExtraSchemaChecks */
-   sizeof(long double)>8,     /* bUseLongDouble */
+   sizeof(LONGDOUBLE_TYPE)>8, /* bUseLongDouble */
    0x7ffffffe,                /* mxStrlen */
    0,                         /* neverCorrupt */
    SQLITE_DEFAULT_LOOKASIDE,  /* szLookaside, nLookaside */

diff --git a/src/main.c b/src/main.c
index 19f65dac6f50cc9f1e9da747d25a97c62e087893..8f21af13eed745ab7172c80431bdffac79329144 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4472,11 +4472,14 @@ int sqlite3_test_control(int op, ...){
 
     /* sqlite3_test_control(SQLITE_TESTCTRL_USELONGDOUBLE, int X);
     **
-    ** Enable long double usage if X>0.  Disable if X==0.  No-op if X<0.
-    ** Return the status of long double usage afterwards.
+    **   X<0     Make no changes to the bUseLongDouble.  Just report value.
+    **   X==0    Disable bUseLongDouble
+    **   X==1    Enable bUseLongDouble
+    **   X==2    Set bUseLongDouble to its default value for this platform
     */
     case SQLITE_TESTCTRL_USELONGDOUBLE: {
       int b = va_arg(ap, int);
+      if( b==2 ) b = sizeof(LONGDOUBLE_TYPE)>8;
       if( b>=0 ) sqlite3Config.bUseLongDouble = b>0;
       rc = sqlite3Config.bUseLongDouble!=0;
       break;

diff --git a/src/shell.c.in b/src/shell.c.in
index 295d405cbda003c0fd90ade948781ab87b873039..9165f21f71420220070274faebbb21facd12680a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10876,7 +10876,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     {"seek_count",         SQLITE_TESTCTRL_SEEK_COUNT,  0, ""               },
     {"sorter_mmap",        SQLITE_TESTCTRL_SORTER_MMAP, 0, "NMAX"           },
     {"tune",               SQLITE_TESTCTRL_TUNE,        1, "ID VALUE"       },
-    {"uselongdouble",      SQLITE_TESTCTRL_USELONGDOUBLE,0,"BOOLEAN"        },
+    {"uselongdouble",    SQLITE_TESTCTRL_USELONGDOUBLE,0,"?BOOLEAN|\"default\"?"},
     };
     int testctrl = -1;
     int iCtrl = -1;
@@ -11000,7 +11000,14 @@ static int do_meta_command(char *zLine, ShellState *p){
 
         /* sqlite3_test_control(int, int) */
         case SQLITE_TESTCTRL_USELONGDOUBLE: {
-          int opt = nArg==3 ? booleanValue(azArg[2]) : -1;
+          int opt = -1;
+          if( nArg==3 ){
+            if( cli_strcmp(azArg[2],"default")==0 ){
+              opt = 2;
+            }else{
+              opt = booleanValue(azArg[2]);
+            }
+          }
           rc2 = sqlite3_test_control(testctrl, opt);
           isOk = 1;
           break;

diff --git a/src/test1.c b/src/test1.c
index acae44c8ace754aa2a7cb4ae121546f45b33b0ea..adc862156f4ef5016241f502671c4eb92d4b76dc 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -7099,11 +7099,14 @@ static int SQLITE_TCLAPI extra_schema_checks(
 }
 
 /*
-** tclcmd:  use_long_double INT
+** tclcmd:  use_long_double BOOLEAN|"default"
 **
-** Enable or disable the use of long double.   Enable if the argument is
-** positive.  Disable if the argument is zero.  No-op if the argument is
-** negative.
+** If no argument, report the current value of the use-long-double flag.
+**
+** If argument is "default", set the use-long-double flag to the default
+** value for this build, based on the size of LONGDOUBLE_TYPE.
+**
+** If argument is a boolean, set the use-long-double flag accordingly.
 **
 ** Return the new setting.
 */
@@ -7115,7 +7118,11 @@ static int SQLITE_TCLAPI use_long_double(
 ){
   int i = -1;
   if( objc==2 ){
-    if( Tcl_GetBooleanFromObj(interp,objv[1],&i) ) return TCL_ERROR;
+    if( strcmp(Tcl_GetString(objv[1]),"default")==0 ){
+      i = 2;
+    }else{
+      if( Tcl_GetBooleanFromObj(interp,objv[1],&i) ) return TCL_ERROR;
+    }
   }
   i = sqlite3_test_control(SQLITE_TESTCTRL_USELONGDOUBLE, i);
   Tcl_SetObjResult(interp, Tcl_NewIntObj(i));