From: dan <Dan Kennedy>
Date: Wed, 13 Sep 2023 11:24:58 +0000 (+0000)
Subject: Replace an if() condition in fts5 that is always true with an assert().
X-Git-Tag: version-3.44.0~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef1c11f920c7316c04981420bbe8c83dcc2bb93;p=thirdparty%2Fsqlite.git

Replace an if() condition in fts5 that is always true with an assert().

FossilOrigin-Name: 2170312c8d7f076cbb8319227de3fac981432dae186bc1928cd217e41119b580
---

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index ec8d2d6b78..0af997f9ed 100644
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -1354,9 +1354,8 @@ static int fts5FilterMethod(
     pCsr->pExpr = pTab->pSortCsr->pExpr;
     rc = fts5CursorFirst(pTab, pCsr, bDesc);
   }else if( pCsr->pExpr ){
-    if( rc==SQLITE_OK ){
-      rc = fts5CursorParseRank(pConfig, pCsr, pRank);
-    }
+    assert( rc==SQLITE_OK );
+    rc = fts5CursorParseRank(pConfig, pCsr, pRank);
     if( rc==SQLITE_OK ){
       if( bOrderByRank ){
         pCsr->ePlan = FTS5_PLAN_SORTED_MATCH;
diff --git a/manifest b/manifest
index 57efb86cf7..49e85b6254 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C CLI\s.import\sto\saccept\sEOF\sin\slieu\sof\srecord\sterminator\son\slast\sfield\sof\sCSV\s(with\smultiple\sfield\srecords),\sper\sRFC\s4180.\s[forum:5b21c25bdfa|forum\spost\s5b21c25bdfa]
-D 2023-09-12T23:21:39.042
+C Replace\san\sif()\scondition\sin\sfts5\sthat\sis\salways\strue\swith\san\sassert().
+D 2023-09-13T11:24:58.386
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -95,7 +95,7 @@ F ext/fts5/fts5_config.c 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d
 F ext/fts5/fts5_expr.c bd3b81ce669c4104e34ffe66570af1999a317b142c15fccb112de9fb0caa57a6
 F ext/fts5/fts5_hash.c 65e7707bc8774706574346d18c20218facf87de3599b995963c3e6d6809f203d
 F ext/fts5/fts5_index.c a86bcd5637625ce1037649d55974ab8da1fa8d1375cb334aae47ef376642e93b
-F ext/fts5/fts5_main.c 48dbb08b1f6e5c124afc92bcb0e064462815cb0491e8fa004e4fcb1779266091
+F ext/fts5/fts5_main.c 2249d21bb384e2af55fab48e309c6adb9d83f83a10b2ac34788da93270064368
 F ext/fts5/fts5_storage.c 3c9b41fce41b6410f2e8f82eb035c6a29b2560483f773e6dc98cf3cb2e4ddbb5
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@ -2119,8 +2119,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 cb54c2da52d3175844127ead41cfed18793e91ea52e02af2d57c1d17b4312437
-R 86a79ec16a16370ae7ab57df84d9fabf
-U larrybr
-Z 5cce62a4c79e08e73bd815b21ee95070
+P 6f7842f577a28df1f809cd4bae9e8eafa26f2b54a25a1362ebbdebf5026be57c
+R f3b4c841c08d4c6a9c1041284895fe73
+U dan
+Z 604f49d2d8fa4165afb87849a7893996
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8d409df648..3e8ccff922 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f7842f577a28df1f809cd4bae9e8eafa26f2b54a25a1362ebbdebf5026be57c
\ No newline at end of file
+2170312c8d7f076cbb8319227de3fac981432dae186bc1928cd217e41119b580
\ No newline at end of file