From 72ab36619233cdf216716f5f17541dfc78d60abd Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 18 Oct 2022 22:37:07 +0000 Subject: [PATCH] If a virtual column whose value is constant gets indexed, do not include that column in the IndexedExpr list. dbsqlfuzz 59ac17a99b9a5c4930ee71cc153c9428a0c0e794 FossilOrigin-Name: c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/where.c | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index dbc666f750..d02cffb63f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\sbyte-code\scomments\sfor\sthe\sOP_Column\sopcodes\sused\sby\sthe\nindexed\sexpression\soptimization. -D 2022-10-18T20:27:02.327 +C If\sa\svirtual\scolumn\swhose\svalue\sis\sconstant\sgets\sindexed,\sdo\snot\sinclude\nthat\scolumn\sin\sthe\sIndexedExpr\slist.\ndbsqlfuzz\s59ac17a99b9a5c4930ee71cc153c9428a0c0e794 +D 2022-10-18T22:37:07.303 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -708,7 +708,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b -F src/where.c cd5b21856c18ccf739f8b2eb29a2eb97ee69cf6381b10b783a6a2a9f57b99125 +F src/where.c 5dcd88d080ad302da4278f55acce12fd1c1f91eff2bcbfa2c0806d33fa230a5f F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743 F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1 F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405 @@ -2036,8 +2036,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 54c3eb085aca92da2b819f3532ee4750b377265f7e1e914600ea3c3d535efe51 -R ae1b5d3a3c2ab2b867842bafa6837a36 +P bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c +R 4b10826dbdabc43e45460aaf0b235a26 U drh -Z cb3bd1c1a3ec2d75a54535d3d8da6ebd +Z be3c5dec512d6ceddfe2e2950bc8e7bf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 54e63697ea..5b7598c5ff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bf6d837fddbf74d5b3f40ad01ea4564edfac00b651d6f3f0e996cc5dc18bb06c \ No newline at end of file +c21eb903f06a16d4fafa5f895be08414fa58e6a91c148030aec8676b40c2d66d \ No newline at end of file diff --git a/src/where.c b/src/where.c index dccf493873..8c65dc7b02 100644 --- a/src/where.c +++ b/src/where.c @@ -5426,6 +5426,7 @@ static SQLITE_NOINLINE void whereAddIndexedExpr( }else{ continue; } + if( sqlite3ExprIsConstant(pExpr) ) continue; p = sqlite3DbMallocRaw(pParse->db, sizeof(IndexedExpr)); if( p==0 ) break; p->pIENext = pParse->pIdxExpr; -- 2.39.5