From: drh <>
Date: Sat, 25 Mar 2023 23:40:21 +0000 (+0000)
Subject: Add usage detection to the NULL value generator for the left table of a
X-Git-Tag: version-3.42.0~212^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frightjoin-agg-idxexpr;p=thirdparty%2Fsqlite.git

Add usage detection to the NULL value generator for the left table of a
RIGHT JOIN inside of an aggregate.

FossilOrigin-Name: 4d05a009dfb63bcb4173da4d09ccc00c308ce4dd2534a32aeb23c5d8d6a1fd4b
---

diff --git a/manifest b/manifest
index 543571e7e4..20441d9d79 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sthe\sleft\stable\sof\sa\sRIGHT\sJOIN\sis\sused\sinside\san\saggregate\sfunction\nand\sthe\sleft\stable\semploys\san\sindex\son\sexpressions,\sthen\smake\ssure\sthe\nexpressions\sevaluate\sto\sNULL\sfor\sthe\scases\swhere\sthe\sleft\stable\sshould\sbe\nNULL.\s\sProposed\sfix\sfor\s[forum:/forumpost/9b491e1deb|forum\spost\s9b491e1deb].\nMore\stesting\san\sanalysis\sneeded\s-\sthere\sis\sa\sFIXME\sin\sthis\scheck-in.
-D 2023-03-25T21:01:11.261
+C Add\susage\sdetection\sto\sthe\sNULL\svalue\sgenerator\sfor\sthe\sleft\stable\sof\sa\nRIGHT\sJOIN\sinside\sof\san\saggregate.
+D 2023-03-25T23:40:21.196
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 201fe0763c52783d205c8c13cdd9d55c1bd5cb21c1f036753f99103b43284b90
-F src/expr.c c6f7772fd988d86c9e9c34d19e62369cb26de6a783dbc5fe77d8d952e973425f
+F src/expr.c c938990570effc02e065b176702d627a0237ec796263c142868f8007b0b703c0
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -2051,8 +2051,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 c104e5c6eeb89575319d9f94f49446142b06912fa8b283c19d46aa2ccddc5bda
-R 2bf850351800b6fc356e18027e4287ef
+P 3572b40a7dfc4acc35e72e08e79f64688f8737e57ac89e4d10e6b32bd5178c63
+R c45a71619ca942293d80f31a1a49eea4
 U drh
-Z 3175f533ee39afc8052867b6068f0268
+Z aa39fec11cd82de6900c756e7906d67c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 11883c7ef5..f9540775bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3572b40a7dfc4acc35e72e08e79f64688f8737e57ac89e4d10e6b32bd5178c63
\ No newline at end of file
+4d05a009dfb63bcb4173da4d09ccc00c308ce4dd2534a32aeb23c5d8d6a1fd4b
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 372e598036..cd09c0d711 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4224,9 +4224,15 @@ expr_code_doover:
       assert( pAggInfo!=0 );
       assert( pExpr->iAgg>=0 );
       if( pExpr->iAgg>=pAggInfo->nColumn ){
+        /* Happens when the left table of a RIGHT JOIN is null and
+        ** is using an expression index */
         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
-        /* FIXME:  Need to verify that tests run this opcode
-        ** Some kind of coverage macro.. VdbeCoverage(v);  tag-20230325-2 */
+#ifdef SQLITE_VDBE_COVERAGE
+        /* Verify that the OP_Null above is exercised by tests
+        ** tag-20230325-2 */
+        sqlite3VdbeAddOp2(v, OP_NotNull, target, 1);
+        VdbeCoverageNeverTaken(v);
+#endif
         break;
       }
       pCol = &pAggInfo->aCol[pExpr->iAgg];