From d685dd6be6c3a2ff8ef6836db22632aa0e4ac99b Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 19 Mar 2021 13:53:34 +0000 Subject: [PATCH 1/6] Correlated CTEs should not generate a materialization subroutine. If they need to be materialized, each use case must be materialized separately. dbsqlfuzz 01b8355086998f0a452cb31208e80b9d29ca739a. FossilOrigin-Name: d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/select.c | 6 ++++-- test/with2.test | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 95b93306a9..2424eb4570 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\sNEVER()\son\sa\sbranch\sthat\swas\smade\sunreachable\sby\sthe\n"circular\sreference"\sfix. -D 2021-03-18T20:04:46.953 +C Correlated\sCTEs\sshould\snot\sgenerate\sa\smaterialization\ssubroutine.\s\sIf\sthey\nneed\sto\sbe\smaterialized,\seach\suse\scase\smust\sbe\smaterialized\sseparately.\ndbsqlfuzz\s01b8355086998f0a452cb31208e80b9d29ca739a. +D 2021-03-19T13:53:34.650 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -542,7 +542,7 @@ F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c 72b2a58bf6e01812c7ea392ab3dc9c7faa814d5558f98d9e4fd6a142f562c608 +F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a F src/shell.c.in 8df3912a7ca4873a1443d4adef1b25baee8c086ab479fd9c4f13ab03f98049ab F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -1788,7 +1788,7 @@ F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3c F test/windowfault.test d543d46571b32d19f198cb04b6505747fabf3cc369970daae47074ee793612be F test/windowpushd.test 5b9c114e8173c3addacf58a0fcd941437b14649f2033700184479a13f188ad00 F test/with1.test 780be387f01e290e768bdfd1827280f9e37ba37223eb4736aba386864fac5a94 -F test/with2.test de3b9070ab4e4a8fdbba8d46dd06a17e47088314a3070479bd3882f178f61593 +F test/with2.test 000fb95f1f29dae868cea0f41505eb5126077d49eb967ff88f9ee46212ad8863 F test/with3.test 2f1e05aef7aeef9a741cbf36deeb4be73003dc541921c3abc78becbbf5b7852d F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f198205 F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8 @@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P ee86e2f4c5999a090a5d2fe8251107cf55e621a6b988f315eb82f462cc1e377d -R 51db1a8cd353cea4b335d0a191e38003 +P 114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0 +R 5b9e8bca84d94a1c983f6d5cd7f00b21 U drh -Z 06f86de8c8593bdbc3934905423493ca +Z 816415a058e22d518551f844fc582ad4 diff --git a/manifest.uuid b/manifest.uuid index 2a8120d42a..938d257065 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0 \ No newline at end of file +d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d \ No newline at end of file diff --git a/src/select.c b/src/select.c index 0c0bd84f2e..e2fa051e59 100644 --- a/src/select.c +++ b/src/select.c @@ -6386,7 +6386,9 @@ int sqlite3Select( sqlite3VdbeAddOp2(v, OP_OpenDup, pItem->iCursor, pPrior->iCursor); pSub->nSelectRow = pPrior->pSelect->nSelectRow; }else{ - /* Generate a subroutine that will materialize the view. */ + /* Materalize the view. If the view is not correlated, generate a + ** subroutine to do the materialization so that subsequent uses of + ** the same view can reuse the materialization. */ int topAddr; int onceAddr = 0; int retAddr; @@ -6413,7 +6415,7 @@ int sqlite3Select( VdbeComment((v, "end %s", pItem->pTab->zName)); sqlite3VdbeChangeP1(v, topAddr, retAddr); sqlite3ClearTempRegCache(pParse); - if( pItem->fg.isCte ){ + if( pItem->fg.isCte && pItem->fg.isCorrelated==0 ){ CteUse *pCteUse = pItem->u2.pCteUse; pCteUse->addrM9e = pItem->addrFillSub; pCteUse->regRtn = pItem->regReturn; diff --git a/test/with2.test b/test/with2.test index 9654619b2c..1051c6fb17 100644 --- a/test/with2.test +++ b/test/with2.test @@ -533,4 +533,20 @@ do_execsql_test 9.2 { } {} } ;# end ifcapable vtab +# 2021-03-19 +# dbsqlfuzz 01b8355086998f0a452cb31208e80b9d29ca739a +# +# Correlated CTEs should not be materialized. +# +reset_db +do_execsql_test 10.1 { + SELECT 1 AS c WHERE ( + SELECT ( + WITH t1(a) AS (VALUES( c )) + SELECT ( SELECT t1a.a FROM t1 AS t1a, t1 AS t1x ) + FROM t1 AS xyz GROUP BY 1 + ) + ) +} {1} + finish_test From 93eb906488f33283686c9d1fa71481f0f9c84968 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 19 Mar 2021 14:26:24 +0000 Subject: [PATCH 2/6] Fix a crash that could occur when an INSERT has more than one ON CONFLICT clause, at least one of which contains an unresolvable symbol. FossilOrigin-Name: 74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/insert.c | 4 +++- test/upsert5.test | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 2424eb4570..245a4a9d01 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Correlated\sCTEs\sshould\snot\sgenerate\sa\smaterialization\ssubroutine.\s\sIf\sthey\nneed\sto\sbe\smaterialized,\seach\suse\scase\smust\sbe\smaterialized\sseparately.\ndbsqlfuzz\s01b8355086998f0a452cb31208e80b9d29ca739a. -D 2021-03-19T13:53:34.650 +C Fix\sa\scrash\sthat\scould\soccur\swhen\san\sINSERT\shas\smore\sthan\sone\sON\sCONFLICT\sclause,\sat\sleast\sone\sof\swhich\scontains\san\sunresolvable\ssymbol. +D 2021-03-19T14:26:24.807 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -503,7 +503,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c 8942baede303a54ba3b6d06200d5b74c9bc25ababec8a55823e06309748cd4a3 +F src/insert.c 9b2a2cf53ef800d85f9068a29d5ed8a0e97f230f69670a13e7682c646194a06b F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067 F src/main.c 2a7ece3a67c646e5fe9984ffe0277d6a76f80ce9715bf2faa591d8cb66b9d913 @@ -1661,7 +1661,7 @@ F test/upsert1.test 88f9e258c6a0eeeb85937b08831e8daad440ba41f125af48439e9d33f266 F test/upsert2.test 9c3cdbb1a890227f6504ce4b0e3de68f4cdfa16bb21d8641208a9239896c5a09 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5 -F test/upsert5.test f49faf5f15b5c3641c6f5d7c7cc531ef5ac997567b2b6bb7bc96f7c88753ca0b +F test/upsert5.test fff0dcfce73c649204543088d8e5bde01172676063ec9b8f8fc7f195abc386fe F test/upsertfault.test f21ca47740841fdb4d61acfa7b17646d773e67724fe8c185b71c018db8a94b35 F test/uri.test 3481026f00ade6dfe8adb7acb6e1e47b04369568 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7 @@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0 -R 5b9e8bca84d94a1c983f6d5cd7f00b21 -U drh -Z 816415a058e22d518551f844fc582ad4 +P d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d +R bcb15951d277d096d901a816b4d30958 +U dan +Z c79e8253e90008ac8a8434f522d3d1f4 diff --git a/manifest.uuid b/manifest.uuid index 938d257065..86f53619df 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d \ No newline at end of file +74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543 \ No newline at end of file diff --git a/src/insert.c b/src/insert.c index f0b93ae376..62b880b222 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1004,7 +1004,9 @@ void sqlite3Insert( pNx->iDataCur = iDataCur; pNx->iIdxCur = iIdxCur; if( pNx->pUpsertTarget ){ - sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx); + if( sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx) ){ + goto insert_cleanup; + } } pNx = pNx->pNextUpsert; }while( pNx!=0 ); diff --git a/test/upsert5.test b/test/upsert5.test index c4747ddf18..3161abf15e 100644 --- a/test/upsert5.test +++ b/test/upsert5.test @@ -394,4 +394,18 @@ foreach {tn sql} { } +#-------------------------------------------------------------------------- +reset_db +do_execsql_test 2.0 { + CREATE TABLE t2(a, b, c REAL, d, e, PRIMARY KEY(a,b)) WITHOUT ROWID; + CREATE UNIQUE INDEX t2c ON t2(c); +} + +do_catchsql_test 2.1 { + INSERT INTO t2(a,b,c,e,d) VALUES(1,2,3,4,5) + ON CONFLICT(c) DO UPDATE SET b='' + ON CONFLICT((SELECT t2 FROM nosuchtable)) DO NOTHING; + +} {1 {no such table: nosuchtable}} + finish_test From 66f9655599f353f5e9bf5ff745d6e162095677a3 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 19 Mar 2021 14:51:15 +0000 Subject: [PATCH 3/6] Restore the NEVER() that was taken out by [f481636f1a0333c6] because that case is no longer reachable after the previous check-in. FossilOrigin-Name: e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/expr.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 245a4a9d01..e4a5354d0f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\scrash\sthat\scould\soccur\swhen\san\sINSERT\shas\smore\sthan\sone\sON\sCONFLICT\sclause,\sat\sleast\sone\sof\swhich\scontains\san\sunresolvable\ssymbol. -D 2021-03-19T14:26:24.807 +C Restore\sthe\sNEVER()\sthat\swas\staken\sout\sby\s[f481636f1a0333c6]\sbecause\sthat\ncase\sis\sno\slonger\sreachable\safter\sthe\sprevious\scheck-in. +D 2021-03-19T14:51:15.769 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8 -F src/expr.c d681f0b48b1e16173ad8e1e8f7323cda120a0c517cb7a3d5b329c4e2c57f18bd +F src/expr.c 984bb2ded097e32ab55c74abcc6f8b190ce5153b6e6d0161b186ba8c936fd8b3 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e @@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d -R bcb15951d277d096d901a816b4d30958 -U dan -Z c79e8253e90008ac8a8434f522d3d1f4 +P 74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543 +R d7e56a775f22fa2f94d209a470f2d469 +U drh +Z 01cc36894d56ba5c965c1565c13dffa4 diff --git a/manifest.uuid b/manifest.uuid index 86f53619df..8e604a742a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543 \ No newline at end of file +e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index bd12ad9f0c..fb8456b193 100644 --- a/src/expr.c +++ b/src/expr.c @@ -615,7 +615,7 @@ static void codeVectorCompare( int isCommuted = ExprHasProperty(pExpr,EP_Commuted); assert( !ExprHasVVAProperty(pExpr,EP_Immutable) ); - if( pParse->nErr ) return; + if( NEVER(pParse->nErr) ) return; if( nLeft!=sqlite3ExprVectorSize(pRight) ){ sqlite3ErrorMsg(pParse, "row value misused"); return; From 4cf34a5e731c9e56b9e959091f406b35d1a1d5f9 Mon Sep 17 00:00:00 2001 From: larrybr Date: Fri, 19 Mar 2021 15:02:59 +0000 Subject: [PATCH 4/6] Fix tokenizer's classification of EBCDIC newline. FossilOrigin-Name: 8680f6a8fb34b9c0ea9b4286888b4df5df427d2df10c782d198bc3f2fdcd0704 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/tokenize.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index e4a5354d0f..0397d58c15 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Restore\sthe\sNEVER()\sthat\swas\staken\sout\sby\s[f481636f1a0333c6]\sbecause\sthat\ncase\sis\sno\slonger\sreachable\safter\sthe\sprevious\scheck-in. -D 2021-03-19T14:51:15.769 +C Fix\stokenizer's\sclassification\sof\sEBCDIC\snewline. +D 2021-03-19T15:02:59.810 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -606,7 +606,7 @@ F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a9 F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c -F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9 +F src/tokenize.c 0b9c82fa628b5adce93e2bcaf935a24d43eb83344fb51551f7835526d0693fc4 F src/treeview.c c6260e1fa5f41c361b2409edc9b0050bcaef5bc4d6abc467fbc45f0d7ccf3d84 F src/trigger.c 861c3ec2c5b0fc830bdf82470454a9324fad70cbaa96d2e208fb54577c9e8d28 F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723 @@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543 -R d7e56a775f22fa2f94d209a470f2d469 -U drh -Z 01cc36894d56ba5c965c1565c13dffa4 +P e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b +R 167f43555244d0f5e16a9a8c35eced48 +U larrybr +Z b41157889309f12fd102fb371fb7b655 diff --git a/manifest.uuid b/manifest.uuid index 8e604a742a..9ff787e88b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b \ No newline at end of file +8680f6a8fb34b9c0ea9b4286888b4df5df427d2df10c782d198bc3f2fdcd0704 \ No newline at end of file diff --git a/src/tokenize.c b/src/tokenize.c index 712447c4ca..5e01de2b90 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -80,7 +80,7 @@ static const unsigned char aiClass[] = { #ifdef SQLITE_EBCDIC /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */ /* 0x */ 29, 28, 28, 28, 28, 7, 28, 28, 28, 28, 28, 28, 7, 7, 28, 28, -/* 1x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +/* 1x */ 28, 28, 28, 28, 28, 7, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, /* 2x */ 28, 28, 28, 28, 28, 7, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, /* 3x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, /* 4x */ 7, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 26, 12, 17, 20, 10, From 340fd0bc232ffeb38f605c4360569e82130c3b4b Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 19 Mar 2021 16:29:40 +0000 Subject: [PATCH 5/6] Dbsqlfuzz found a new way to make that branch in codeVectorCompare reachable. FossilOrigin-Name: 959272c27555e39f180d46257afe45d41da1f5df38ea269196c06741ff6a278e --- manifest | 17 +++++++++-------- manifest.uuid | 2 +- src/expr.c | 2 +- test/rowvalue.test | 6 ++++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 0397d58c15..99befd19b4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stokenizer's\sclassification\sof\sEBCDIC\snewline. -D 2021-03-19T15:02:59.810 +C Dbsqlfuzz\sfound\sa\snew\sway\sto\smake\sthat\sbranch\sin\scodeVectorCompare\nreachable. +D 2021-03-19T16:29:40.489 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8 -F src/expr.c 984bb2ded097e32ab55c74abcc6f8b190ce5153b6e6d0161b186ba8c936fd8b3 +F src/expr.c d681f0b48b1e16173ad8e1e8f7323cda120a0c517cb7a3d5b329c4e2c57f18bd F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e @@ -1303,7 +1303,7 @@ F test/round1.test 768018b04522ca420b1aba8a24bd76091d269f3bce3902af3ec6ebcee41ab F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81 F test/rowid.test bfbd7b97d9267660be3c8f28507c4ed7f205196b8877c0db42df347c2e8845e3 -F test/rowvalue.test b5436c767394a3f8fa5e7e474b2114ba430fdab34a5c8573c1b6256756534565 +F test/rowvalue.test 6795850abf6243e96f09ef041919d1ea61713332237b60d01371c0fee73f6379 F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256 F test/rowvalue4.test 02e35f7762371c2f57ebd856aa056eac56cb27ef7715a0bb31eac1895a745356 @@ -1910,7 +1910,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 e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b -R 167f43555244d0f5e16a9a8c35eced48 -U larrybr -Z b41157889309f12fd102fb371fb7b655 +P 8680f6a8fb34b9c0ea9b4286888b4df5df427d2df10c782d198bc3f2fdcd0704 +Q -e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b +R 0c398f65129257e7e775e6833cec8370 +U drh +Z c6f0a90e3c4ced48d29dbd1f0482c120 diff --git a/manifest.uuid b/manifest.uuid index 9ff787e88b..0565452393 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8680f6a8fb34b9c0ea9b4286888b4df5df427d2df10c782d198bc3f2fdcd0704 \ No newline at end of file +959272c27555e39f180d46257afe45d41da1f5df38ea269196c06741ff6a278e \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index fb8456b193..bd12ad9f0c 100644 --- a/src/expr.c +++ b/src/expr.c @@ -615,7 +615,7 @@ static void codeVectorCompare( int isCommuted = ExprHasProperty(pExpr,EP_Commuted); assert( !ExprHasVVAProperty(pExpr,EP_Immutable) ); - if( NEVER(pParse->nErr) ) return; + if( pParse->nErr ) return; if( nLeft!=sqlite3ExprVectorSize(pRight) ){ sqlite3ErrorMsg(pParse, "row value misused"); return; diff --git a/test/rowvalue.test b/test/rowvalue.test index 91a59e71c3..b9967a865a 100644 --- a/test/rowvalue.test +++ b/test/rowvalue.test @@ -657,4 +657,10 @@ do_catchsql_test 28.10 { DELETE FROM t0; } {1 {sub-select returns 2 columns - expected 1}} +# 2021-03-19 +# dbsqlfuzz find of a NEVER(). +do_catchsql_test 29.1 { + SELECT (SELECT 1 WHERE ((SELECT 1 WHERE (2,(2,0)) IS (2,(20))),(2,0)) IS (2,(20))) WHERE (2,(2,0)) IS (2 IN(SELECT 1 WHERE (2,(2,2,0)) IS (2,(20))),(20)); +} {1 {row value misused}} + finish_test From 49e6e5a04fe0d9f3d3ec4df4d53751225b8161c0 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 19 Mar 2021 17:54:43 +0000 Subject: [PATCH 6/6] In the wholenumber virtual table, increase the cost penalty for running open-loop. This appears to fix the problem reported by [https://sqlite.org/forum/forumpost/b52a020ce4|forum post b52a020ce4]. FossilOrigin-Name: f12b54042e27b2fe99f23f97c103ee4371f8d4df3b049d9bb5d64891db56eee5 --- ext/misc/wholenumber.c | 2 +- manifest | 13 ++++++------- manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ext/misc/wholenumber.c b/ext/misc/wholenumber.c index 5643f9cf7e..03d6e6902e 100644 --- a/ext/misc/wholenumber.c +++ b/ext/misc/wholenumber.c @@ -220,7 +220,7 @@ static int wholenumberBestIndex( pIdxInfo->orderByConsumed = 1; } if( (idxNum & 12)==0 ){ - pIdxInfo->estimatedCost = (double)100000000; + pIdxInfo->estimatedCost = 1e99; }else if( (idxNum & 3)==0 ){ pIdxInfo->estimatedCost = (double)5; }else{ diff --git a/manifest b/manifest index 99befd19b4..160e3c1b1f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Dbsqlfuzz\sfound\sa\snew\sway\sto\smake\sthat\sbranch\sin\scodeVectorCompare\nreachable. -D 2021-03-19T16:29:40.489 +C In\sthe\swholenumber\svirtual\stable,\sincrease\sthe\scost\spenalty\sfor\srunning\nopen-loop.\s\sThis\sappears\sto\sfix\sthe\sproblem\sreported\sby\n[https://sqlite.org/forum/forumpost/b52a020ce4|forum\spost\sb52a020ce4]. +D 2021-03-19T17:54:43.183 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -336,7 +336,7 @@ F ext/misc/vfslog.c 3b25c2f56ba60788db247287be6ab024b53c4afffd412b4876db563389be F ext/misc/vfsstat.c 389ea13983d3af926504c314f06a83cc858d5adc24b40af74aaed1fece00c118 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd -F ext/misc/wholenumber.c 520f34c3099e5b7d546f13708607dc2fa173c46b68952eecf0d19cd675fec85e +F ext/misc/wholenumber.c a838d1bea913c514ff316c69695efbb49ea3b8cb37d22afc57f73b6b010b4546 F ext/misc/zipfile.c e35e035bc2765b1ccdcb15f9815c2112843fcbc8f36aa071f0e5935df7072228 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64 F ext/rbu/rbu.c b880ca5cb857d6d6f52e72eb7397813058ef48c78c5402cd04ff2b6b5437f622 @@ -1910,8 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 8680f6a8fb34b9c0ea9b4286888b4df5df427d2df10c782d198bc3f2fdcd0704 -Q -e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b -R 0c398f65129257e7e775e6833cec8370 +P 959272c27555e39f180d46257afe45d41da1f5df38ea269196c06741ff6a278e +R 51ac7d994705198c73d6f6e97c1c36d1 U drh -Z c6f0a90e3c4ced48d29dbd1f0482c120 +Z 90da41d95168d1eeb1398c4f34c1c25f diff --git a/manifest.uuid b/manifest.uuid index 0565452393..6133448c43 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -959272c27555e39f180d46257afe45d41da1f5df38ea269196c06741ff6a278e \ No newline at end of file +f12b54042e27b2fe99f23f97c103ee4371f8d4df3b049d9bb5d64891db56eee5 \ No newline at end of file