From: drh <>
Date: Tue, 10 Jun 2025 18:26:09 +0000 (+0000)
Subject: Minor corrections to the new Bitvec testing logic.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a23ff5a07ac3903e1f6dd8f06345fdc394e23ff;p=thirdparty%2Fsqlite.git

Minor corrections to the new Bitvec testing logic.

FossilOrigin-Name: 77b79ca1277419b91589aff2c601d4abdd7107d48019a58f7f7c85d96c2a538e
---

diff --git a/manifest b/manifest
index 04ef150ffc..8725c66a92 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\ssqlite3BitvecBuiltinTest()\sthat\sallow\stesting\scode\sto\ncreate\svery\slarge\sBitvec\sobjects\sthat\sdo\snot\suse\sthe\slinear\sarray\scross-check.
-D 2025-06-10T17:22:53.410
+C Minor\scorrections\sto\sthe\snew\sBitvec\stesting\slogic.
+D 2025-06-10T18:26:09.286
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -724,7 +724,7 @@ F src/analyze.c 03bcfc083fc0cccaa9ded93604e1d4244ea245c17285d463ef6a60425fcb247d
 F src/attach.c 9af61b63b10ee702b1594ecd24fb8cea0839cfdb6addee52fba26fa879f5db9d
 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
-F src/bitvec.c bf4516e0b64905315e41f6cd98fddf3321e1fa45b4639c58c1e33be3a36762f9
+F src/bitvec.c 997e671e5cda1cbed14af3b29c8a6155d78f52386ac5c52e177ded96536325f3
 F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
 F src/btree.c 53a9c7b243e94c992853d90f1dac0959028433b4b0d27e04409cee04e001b508
 F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P dea1e37fa67ada6efc1533b449d9eb22338d9e58eec8f89b48c38319c212c8f4
-R f17be20aba33ae92effa44ccdc334f8f
+P c5680672cae23f65637eebf66f3bb983a2864be03ea70378832034f3c89ef728
+R db1ba5a64ed30c3ee4db5bcae7781ac2
 U drh
-Z d746dc167462d800e8f34514e232eed7
+Z 58131ae6c40b1aa64532119990f28d26
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ba91fb9955..21873285d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5680672cae23f65637eebf66f3bb983a2864be03ea70378832034f3c89ef728
+77b79ca1277419b91589aff2c601d4abdd7107d48019a58f7f7c85d96c2a538e
diff --git a/src/bitvec.c b/src/bitvec.c
index 3855ebfc2e..70be555bb4 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -311,7 +311,7 @@ static void showBitvec(Bitvec *p, int n, unsigned x){
     printf("NULL\n");
     return;
   }
-  printf("Bitvec 0x%p iSize=%d", p, p->iSize);
+  printf("Bitvec 0x%p iSize=%u", p, p->iSize);
   if( p->iSize<=BITVEC_NBIT ){
     printf(" bitmap\n");
     printf("%*s   bits:", n, "");
@@ -320,14 +320,14 @@ static void showBitvec(Bitvec *p, int n, unsigned x){
     }
     printf("\n");
   }else if( p->iDivisor==0 ){
-    printf(" hash with %d entries\n", p->nSet);
+    printf(" hash with %u entries\n", p->nSet);
     printf("%*s   bits:", n, "");
     for(i=0; i<BITVEC_NINT; i++){
       if( p->u.aHash[i] ) printf(" %u", x+(unsigned)p->u.aHash[i]);
     }
     printf("\n");
   }else{
-    printf(" sub-bitvec with iDivisor=%d\n", p->iDivisor);
+    printf(" sub-bitvec with iDivisor=%u\n", p->iDivisor);
     for(i=0; i<BITVEC_NPTR; i++){
       if( p->u.apSub[i]==0 ) continue;
       printf("%*s   apSub[%d]=", n, "", i);
@@ -406,7 +406,7 @@ int sqlite3BitvecBuiltinTest(int sz, int *aOp){
     pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 );
   }
   pTmpSpace = sqlite3_malloc64(BITVEC_SZ);
-  if( pBitvec==0 || pTmpSpace==0  ) goto bitvec_end;
+  if( pBitvec==0 || pTmpSpace==0 || (pV==0 && sz>0) ) goto bitvec_end;
 
   /* NULL pBitvec tests */
   sqlite3BitvecSet(0, 1);
@@ -420,7 +420,6 @@ int sqlite3BitvecBuiltinTest(int sz, int *aOp){
       if( op==6 ){
         sqlite3ShowBitvec(pBitvec);
       }else if( op==7 ){
-        unsigned x = (unsigned)aOp[++pc];
         printf("BITVEC_SZ     = %d (%d by sizeof)\n",
                BITVEC_SZ, (int)sizeof(Bitvec));
         printf("BITVEC_USIZE  = %d\n", (int)BITVEC_USIZE);
@@ -429,7 +428,6 @@ int sqlite3BitvecBuiltinTest(int sz, int *aOp){
         printf("BITVEC_NINT   = %d\n", (int)BITVEC_NINT);
         printf("BITVEC_MXHASH = %d\n", (int)BITVEC_MXHASH);
         printf("BITVEC_NPTR   = %d\n", (int)BITVEC_NPTR);
-        printf("hash(%u): %u\n", x, (unsigned)BITVEC_HASH(x));
       }
 #endif
       pc++;