Fix an assert() in btree to be more precise, as the previous form of that

asser might fail due to recent performance optimizations.

FossilOrigin-Name: 4774938134d0105423720bdc1b4e82164a1e28d993c5cd81c1b03f1f0878427e

diff --git a/manifest b/manifest
index 41d014f90bb0ae1689818a16ca5faddef104815c..ba0bd535d621f16d41492f7c5eb2e07336ee3142 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Size\sreduction\sand\sperformance\soptimization\sin\ssqlite3WalFindFrame().
-D 2022-07-04T15:14:25.563
+C Fix\san\sassert()\sin\sbtree\sto\sbe\smore\sprecise,\sas\sthe\sprevious\sform\sof\sthat\nasser\smight\sfail\sdue\sto\srecent\sperformance\soptimizations.
+D 2022-07-05T10:40:30.126
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -510,7 +510,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c d4037518cecba5f9f69be57800c71eb798848b82cb6940511fdf8c7af726a70a
+F src/btree.c 8923fefe168ffe5b943e053ce4869069e93545af79bb07028d9b08a70957aea4
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 23f874642825d7eaaeeb7a3281b2b1a75e1d4c4dd9ae4dceddcd908266634214
@@ -1978,8 +1978,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 a1c090e08139f99d30aa89db0756dc59fe8990ce15b3db4d4b726cc6acdab46f
-R fed5903c05b22f31489b7dc87a54bece
+P 1a8c2e54375ee2cf73773b798fed0ae07b42f5e068fddc513c093de5c1f46615
+R 2757a3df013fcba9ceda084162d54bbf
 U drh
-Z d121505cf61aa3dde02d007851da9f4e
+Z 1c5dbf09a49cb9834da7c27397ce6fb7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3778ae1c493ff9522698131ee843328d6f3ce72f..c0e86076d8c6290367973b61619f7b7b53ef701e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a8c2e54375ee2cf73773b798fed0ae07b42f5e068fddc513c093de5c1f46615
\ No newline at end of file
+4774938134d0105423720bdc1b4e82164a1e28d993c5cd81c1b03f1f0878427e
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a9a4be99fcc88469599949a8ab8aec8dd1ac277a..c80a81ccc7f9b0f0ab08a0c528ac6427bfb43c62 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -2309,9 +2309,7 @@ getAndInitPage_error1:
     pCur->pPage = pCur->apPage[pCur->iPage];
   }
   testcase( pgno==0 );
-  assert( pgno!=0 || rc==SQLITE_CORRUPT 
-                  || rc==SQLITE_IOERR_NOMEM
-                  || rc==SQLITE_NOMEM );
+  assert( pgno!=0 || rc!=SQLITE_OK );
   return rc;
 }