Fix harmless compiler warning in the new Bloom filter logic.

FossilOrigin-Name: 9406d95d3fbaf0d8e65623adb790845f78a7456fb32aafd7fa4f74eda2f2dacc

diff --git a/manifest b/manifest
index 77d78d26015b766b9d8deecf90ef57f13ebac687..e435a30bbf959aec4a3e85043d5b1c194c147534 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\srobustness\sagainst\sOOM\sin\sthe\sexpert\sextension.
-D 2021-12-16T14:26:16.891
+C Fix\sharmless\scompiler\swarning\sin\sthe\snew\sBloom\sfilter\slogic.
+D 2021-12-16T14:36:36.423
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c ed0398a7adf02c31e34aada42cc86c58f413a7afe5f741a5d373ad087abde028
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 8696f664dceaa7bab9c18212633b1d7d61063ee8c5066b49514b148946a4c467
+F src/where.c d47e14778162f00b732a74fc0b45a92be1b4d5cda3d11876901a3d54a367f5ec
 F src/whereInt.h 91865afa4a3540bb3bd643619acc56fbceff7defeb8f249b8e157fd5325d88be
 F src/wherecode.c 6a594ed25bfbeb60d455868b7be62637575e4f1949152de4336e4825e0c54ba6
 F src/whereexpr.c 9f64c39e53070584e99e4d20c1dd3397e125fabbae8fd414ffec574c410ac7d3
@@ -1934,7 +1934,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 fe44ebf6be47e1c7f2458297669dbd2b882a31595ea8759f7e8bb024ffc44d11
-R 9238339fb3e82f00e85db14fa52ea256
+P e732c429bafeffaf7e0f458213089c073c262a39eabb41b291e5006078ca7f98
+R 720cf5f28e762396fb457a8dae05b590
 U drh
-Z 238125be5e0c8f6d8b18a0df5a618e44
+Z a0a1b2f028aa9dcc9dce157f74e8589a

diff --git a/manifest.uuid b/manifest.uuid
index 29e1991c946437e70c54bbce83e59df7633b0230..bd1766c52f62570d1d07e7bf38df5e6e0bb0bba0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e732c429bafeffaf7e0f458213089c073c262a39eabb41b291e5006078ca7f98
\ No newline at end of file
+9406d95d3fbaf0d8e65623adb790845f78a7456fb32aafd7fa4f74eda2f2dacc
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index c7a9b856aa8d65ff6b235f2ac5d717ee9a3305ba..5210299e7ce5a22edc8fb56c53d1883ca7a6ab18 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -5037,7 +5037,7 @@ static SQLITE_NOINLINE void whereCheckIfBloomFilterIsUseful(
   nSearch = pWInfo->a[0].pWLoop->nOut;
   for(i=1; i<pWInfo->nLevel; i++){
     WhereLoop *pLoop = pWInfo->a[i].pWLoop;
-    const int reqFlags = (WHERE_SELFCULL|WHERE_COLUMN_EQ);
+    const unsigned int reqFlags = (WHERE_SELFCULL|WHERE_COLUMN_EQ);
     if( (pLoop->wsFlags & reqFlags)==reqFlags
      /* vvvvvv--- Always the case if WHERE_COLUMN_EQ is defined */
      && ALWAYS((pLoop->wsFlags & (WHERE_IPK|WHERE_INDEXED))!=0)