Fix some cases where integrity-check would fail to identify real values in indexed...

FossilOrigin-Name: 40c5966f7b784f181365c81fc559aee9463c374ee56677cf6e0aecaed39d2b28

diff --git a/manifest b/manifest
index d1449d277c49541505f04d2c9ef9054fc9d488cc..c48aa4a016d91a744278015d7c854e6043cfeaca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\s"unused\svariable"\scompiler\swarning.
-D 2026-03-18T11:04:15.573
+C Fix\ssome\scases\swhere\sintegrity-check\swould\sfail\sto\sidentify\sreal\svalues\sin\sindexed\sexpressions\sthat\sare\swith\s2\sULPs\sof\seach\sother.
+D 2026-03-18T11:06:10.027
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -803,7 +803,7 @@ F src/vdbe.c ad2275c459f088076b8a99a63230cd9514bb21a4cff98ce73d90e9611c57cad2
 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
 F src/vdbeInt.h f7157f110f88f1d9d8338c292faf23a9129f6712563ade2b408537c95e17bdef
 F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
-F src/vdbeaux.c d6acd54e3dea2373a1d902a6f54718996fd765aa3ca2a4295d4026935337340c
+F src/vdbeaux.c dcac4c41303ffa0677185b93933c69b8d4dc05665732db44dc4ff846b7623631
 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
 F src/vdbemem.c 317ec5e870ddb16951b606c9fe8be22baef22ecbe46f58fdefc259662238afb7
 F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
@@ -1081,7 +1081,7 @@ F test/e_wal.test db7c33642711cf3c7959714b5f012aca08cacfa78da0382f95e849eb3ba66a
 F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 F test/e_walckpt.test 16e7d006e8687654ee59e7ad5a6d285ba23f0fe0eeb87f790afd6bc9cf1d1924
 F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66
-F test/eiib1.test 1b4e1f89c843e081b897219a1a11e7045e10170165b3e84d86ca9b8cae305357
+F test/eiib1.test a08d9c035508951d0145fe51f9476d10d4f67c5c422c0314b49c61cc9c2f3747
 F test/emptytable.test a38110becbdfa6325cd65cb588dca658cd885f62
 F test/enc.test b5503a87b31cea8a5084c6e447383f9ca08933bd2f29d97b6b6201081b2343eb
 F test/enc2.test 872afe58db772e7dfa1ad8e0759f8cc820e9efc8172d460fae83023101c2e435
@@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 82e6de835bde306778425d18ab1a15ae80fdf01af7f577ead89c09f9d53b5b2f
-R 72ffe4d6e682e49227b41b5636605cfd
-U drh
-Z 86e027f5e76c04c51f93e46c660cde54
+P 3380eb1ea71d6bf8325dbe49f4bac7623b3b6193f3b36dedd9411188cfc80b89
+R 1fa101e6bf566650572621bd48ccda87
+U dan
+Z 035b3f31e6c185f4061c4fbc7217b0e4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3f74cc34434efd8f723918b3bd28266e3220702e..f14c58157455ca5a6c41bb701054291181eebcea 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3380eb1ea71d6bf8325dbe49f4bac7623b3b6193f3b36dedd9411188cfc80b89
+40c5966f7b784f181365c81fc559aee9463c374ee56677cf6e0aecaed39d2b28

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 1549e55b1f3aaeb74b4a6053838302df41ac8b60..39a8fd0c0381478dbde159978badda38afbe2073 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5397,6 +5397,17 @@ void sqlite3VdbeSetVarmask(Vdbe *v, int iVar){
   }
 }
 
+/*
+** Convert double value r to a 64-bit index such that real values separated
+** by a single ULP are adjacent (separated by 1 integer value).
+*/
+static i64 vdbeDoubleToIndex(double r){
+  static const u64 signbit = ((u64)1 << 63);
+  u64 u;
+  assert( sizeof(u)==sizeof(r) );
+  memcpy(&u, &r, sizeof(u));
+  return (u & signbit) ? (i64)(signbit - u) : (i64)(signbit + u);
+}
 
 /*
 ** Helper function for vdbeIsMatchingIndexKey(). Return true if column
@@ -5415,21 +5426,14 @@ static int vdbeSkipField(
   Mem *pMem2,                     /* Actual indexed value */
   int bIntegrity
 ){
-#define BTREE_MANTISSA64 ((u64)0x0FFF << 52)
 #define BTREE_ULPDISTORTION 2
   if( iCol>=BMS || (mask & MASKBIT(iCol))==0 ) return 0;
   if( bIntegrity==0 ) return 1;
   if( (pMem1->flags & MEM_Real) && (pMem2->flags & MEM_Real) ){
-    u64 r1 = *(u64*)&pMem1->u.r;
-    u64 r2 = *(u64*)&pMem2->u.r;
-    if( (r1 & BTREE_MANTISSA64)==(r2 & BTREE_MANTISSA64) ){
-      u64 diff;
-      r1 = r1 & ~BTREE_MANTISSA64;
-      r2 = r2 & ~BTREE_MANTISSA64;
-      diff = MIN(r1-r2, r2-r1);
-      if( diff<=BTREE_ULPDISTORTION ){
-        return 1;
-      }
+    i64 i1 = vdbeDoubleToIndex(pMem1->u.r);
+    i64 i2 = vdbeDoubleToIndex(pMem2->u.r);
+    if( ((i1<i2) ? (i2 - i1) : (i1 - i2))<=BTREE_ULPDISTORTION ){
+      return 1;
     }
   }
   return 0;

diff --git a/test/eiib1.test b/test/eiib1.test
index d8089884b6973d5e139b92e740e358a0bad4abe1..74a95a35026a0cf257e481cff40d28af54e5082a 100644 (file)
--- a/test/eiib1.test
+++ b/test/eiib1.test
@@ -219,9 +219,12 @@ do_test 4.1 {
 } {}
 
 do_execsql_test 4.2 {
-  UPDATE x1 SET b=4.000000000000001 WHERE a=2;
-  UPDATE x1 SET b=4.000000000000002 WHERE a=3;
-  UPDATE x1 SET b=4.000000000000003 WHERE a=4;
+  UPDATE x1 SET b=4.000000000000001 WHERE a=2;          -- 1 ULP
+  UPDATE x1 SET b=4.000000000000002 WHERE a=3;          -- 2 ULP
+  UPDATE x1 SET b=4.000000000000003 WHERE a=4;          -- 3 ULP
+  UPDATE x1 SET b=3.9999999999999996 WHERE a=5;         -- -1 ULP
+  UPDATE x1 SET b=3.9999999999999992 WHERE a=6;         -- -2 ULP
+  UPDATE x1 SET b=3.9999999999999988 WHERE a=7;         -- -3 ULP
 }
 
 do_execsql_test 4.3 {
@@ -230,8 +233,35 @@ do_execsql_test 4.3 {
   {WARNING: expression index z1b stores an imprecise value for row 2}
   {WARNING: expression index z1b stores an imprecise value for row 3}
   {row 4 missing from index z1b}
+  {WARNING: expression index z1b stores an imprecise value for row 5}
+  {WARNING: expression index z1b stores an imprecise value for row 6}
+  {row 7 missing from index z1b}
 }
 
+do_execsql_test 4.4 {
+  UPDATE z1 SET b=-4.0 WHERE b=4.0;
+  PRAGMA integrity_check;
+} {ok}
+
+do_execsql_test 4.5 {
+  UPDATE x1 SET b=-4.000000000000001 WHERE a=2;          -- -1 ULP
+  UPDATE x1 SET b=-4.000000000000002 WHERE a=3;          -- -2 ULP
+  UPDATE x1 SET b=-4.000000000000003 WHERE a=4;          -- -3 ULP
+  UPDATE x1 SET b=-3.9999999999999996 WHERE a=5;         -- 1 ULP
+  UPDATE x1 SET b=-3.9999999999999992 WHERE a=6;         -- 2 ULP
+  UPDATE x1 SET b=-3.9999999999999988 WHERE a=7;         -- 3 ULP
+}
+
+do_execsql_test 4.6 {
+  PRAGMA integrity_check
+} {
+  {WARNING: expression index z1b stores an imprecise value for row 2}
+  {WARNING: expression index z1b stores an imprecise value for row 3}
+  {row 4 missing from index z1b}
+  {WARNING: expression index z1b stores an imprecise value for row 5}
+  {WARNING: expression index z1b stores an imprecise value for row 6}
+  {row 7 missing from index z1b}
+}