When computing the verification hash in speedtest1, do not include the

value of floating point results (which can very in trailing bits depending
on platform) but merely hash the fact that a floating point value was
received.

FossilOrigin-Name: e12225d59c63ba392db4fa8dc26700ac26b20c8b98ea5107eef0e0b5138ace87

diff --git a/manifest b/manifest
index 81305d25cabdcddc7941aaa7e7600456a0e156f1..92f2d80ac914009d7ac1dbb4a7d38f0a8c30edb7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Improvements\sto\sspeedtest1.c\sfor\smore\sconsistent\sverification\shashes.
-D 2020-06-26T16:17:27.803
+C When\scomputing\sthe\sverification\shash\sin\sspeedtest1,\sdo\snot\sinclude\sthe\nvalue\sof\sfloating\spoint\sresults\s(which\scan\svery\sin\strailing\sbits\sdepending\non\splatform)\sbut\smerely\shash\sthe\sfact\sthat\sa\sfloating\spoint\svalue\swas\nreceived.
+D 2020-06-26T17:56:43.524
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -15,13 +15,13 @@ F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F test/decimal.test 12739a01bdba4c4d79f95b323e6b67b9fad1ab6ffb56116bd2b9c81a5b19e1d9
 F test/fuzzdata8.db 0ae860b36b79fd41cafddc9e6602358b2d5c331cf200283221e659f86e196c0c
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
-F test/speedtest1.c 01ae6222bef0611bcdafaff2b76aa8ec12348522d6aaf6619e1a8abd986f99b6
+F test/speedtest1.c a8b5afe72d78ff365012aba48d3f0c579e957facb7630f765f58a6ae4656d20d
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfae0e84c
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P f3455cecf22ea98f9ad48e92d620c8e2ec94877e4581731afff0f2bd32014a1d
-R 32ec1322522afe4192abd5165d828296
+P d34b8ff5f8d04a75996f6ca9d3a0563c83e8e833c1eb08ac3861431f36f7bfb1
+R 36a97fda742cd4bac3ca6f8cbc587bc2
 U drh
-Z 5225590eae0cc2fddc9724fb182454b7
+Z 5a87ac0a4d600052fc00b94437e0e024

diff --git a/manifest.uuid b/manifest.uuid
index 713cd0268f575c00a6c44e88d93f709c3cfdd526..41eb0cd7628cdc21fddaffb4a01d72d4ad716b54 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d34b8ff5f8d04a75996f6ca9d3a0563c83e8e833c1eb08ac3861431f36f7bfb1
\ No newline at end of file
+e12225d59c63ba392db4fa8dc26700ac26b20c8b98ea5107eef0e0b5138ace87
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index 9bce17f1c5a0aa56260b7f27130d4f8fe871ea65..723c8cffbd089e88271b7ddb37258ba950f8b0da 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -532,7 +532,6 @@ void speedtest1_run(void){
     n = sqlite3_column_count(g.pStmt);
     for(i=0; i<n; i++){
       const char *z = (const char*)sqlite3_column_text(g.pStmt, i);
-      char zBuf[50];
       if( z==0 ) z = "nil";
       len = (int)strlen(z);
 #ifndef SPEEDTEST_OMIT_HASH
@@ -547,12 +546,10 @@ void speedtest1_run(void){
           HashUpdate(zPrefix+1, 1);
         }
         if( eType==SQLITE_FLOAT ){
-          double r = sqlite3_column_double(g.pStmt, i);
-          sqlite3_snprintf(sizeof(zBuf), zBuf, "%g", r);
-          z = zBuf;
-          len = (int)strlen(z);
-          HashUpdate((unsigned char*)z, len);
-          g.nResByte += len + 2;
+          /* Omit the value of floating-point results from the verification
+          ** hash.  The only thing we record is the fact that the result was
+          ** a floating-point value. */
+          g.nResByte += 2;
         }else if( eType==SQLITE_BLOB ){
           int nBlob = sqlite3_column_bytes(g.pStmt, i);
           int iBlob;