Back out [2904fcbeebba9189], mostly. The page bitmap is needed even for a

partial integrity_check in order to avoid an infinite loops while walking the
database.

FossilOrigin-Name: dd6e03b37356e2961abd97f636402c09744c98c3033f3435503958c6219f9121

diff --git a/manifest b/manifest
index 21b3b4722468b2e5c4d45107774a88e2b334c6f4..b02b8554918498ca0ce53cd2dfba9a413f148f82 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sCLI\sfor\sWindows\sbuilds,\sdo\sMBCS/UTF-8\stranslation\sindependently\sfor\sinput\sand\soutput.\s(And\scure\san\sMSVC\swarning.)
-D 2023-10-26T18:41:13.465
+C Back\sout\s[2904fcbeebba9189],\smostly.\s\sThe\spage\sbitmap\sis\sneeded\seven\sfor\sa\npartial\sintegrity_check\sin\sorder\sto\savoid\san\sinfinite\sloops\swhile\swalking\sthe\ndatabase.
+D 2023-10-27T10:49:17.477
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -660,7 +660,7 @@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
-F src/btree.c f6c8512a0db0851877683e41936aac0f8927bc31630cbb1bc87ccccf79c06944
+F src/btree.c f3b09c5414de3a11db73e11e1d66f4c5e53c9e89876ff3b531a887ab656ca303
 F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
 F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d15
 F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
@@ -2139,8 +2139,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 d2f2f9126562c24966b0e9bc3629b85950c20199c41250478ba1da68eb7a0046 59452e7c72de02c2b6d40974c91173d87fd5f6f2e28c0b1f6f53eb1a09693fb6
-R 1716e4fec6d2ad5fb1fb5737fb80f58b
-U larrybr
-Z 9ed808ed6c9d999a4b8724038afbe422
+P 80f0b6f9c76c049edaaaeedc1745978b9d5b02a9c34bbf64209266a154b2b0e3
+R 84d7c9418e41d2dbf6dd84433b9d6b54
+U drh
+Z eb223c9086f97454e7586a05089e442c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a27d977737465de6b27a3484641dc260929bc74d..3777dcf2b7c8340bc7ea833b5b9d2d7b0b8c6473 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80f0b6f9c76c049edaaaeedc1745978b9d5b02a9c34bbf64209266a154b2b0e3
\ No newline at end of file
+dd6e03b37356e2961abd97f636402c09744c98c3033f3435503958c6219f9121
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 7e340f5e5ea0b17439d63051a1fdff9b41109a50..5be30d562c7259bb819bea57861e4d59d4c4640a 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -10484,7 +10484,6 @@ static void setPageReferenced(IntegrityCk *pCheck, Pgno iPg){
 */
 static int checkRef(IntegrityCk *pCheck, Pgno iPage){
   if( iPage>pCheck->nCkPage || iPage==0 ){
-    if( pCheck->nCkPage==0 ) return 0;  /* omit reference counting */
     checkAppendMsg(pCheck, "invalid page number %u", iPage);
     return 1;
   }
@@ -10990,15 +10989,10 @@ int sqlite3BtreeIntegrityCheck(
     goto integrity_ck_cleanup;
   }
 
-  if( bPartial ){
-    sCheck.nCkPage = 0;
-    sCheck.aPgRef = 0;
-  }else{
-    sCheck.aPgRef = sqlite3MallocZero((sCheck.nCkPage / 8)+ 1);
-    if( !sCheck.aPgRef ){
-      checkOom(&sCheck);
-      goto integrity_ck_cleanup;
-    }
+  sCheck.aPgRef = sqlite3MallocZero((sCheck.nCkPage / 8)+ 1);
+  if( !sCheck.aPgRef ){
+    checkOom(&sCheck);
+    goto integrity_ck_cleanup;
   }
   sCheck.heap = (u32*)sqlite3PageMalloc( pBt->pageSize );
   if( sCheck.heap==0 ){