Ensure that the second pass call to wherePathSolver() always reports a positive
value for the estimated number of output rows. This fixes a long-standing (though exceedingly minor) problem that was only revealed by a new assert() added yesterday. dbsqlfuzz 545d6debc2da496ab2b915e33ea34d9a35a935df FossilOrigin-Name: a47c644fef71f3ab3dc584ea917eaab9a8e5b4c9dcb57bdd29747ba32108e85f
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
C Update\sshell.c\sto\suse\sthe\smsteve\sfork\sof\slinenoise,\sper\s/chat\sdiscussion.
|
||||
D 2024-05-30T11:14:16.476
|
||||
C Ensure\sthat\sthe\ssecond\spass\scall\sto\swherePathSolver()\salways\sreports\sa\spositive\nvalue\sfor\sthe\sestimated\snumber\sof\soutput\srows.\s\sThis\sfixes\sa\slong-standing\n(though\sexceedingly\sminor)\sproblem\sthat\swas\sonly\srevealed\sby\sa\snew\sassert()\nadded\syesterday.\s\sdbsqlfuzz\s545d6debc2da496ab2b915e33ea34d9a35a935df
|
||||
D 2024-05-30T13:27:29.661
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@@ -840,7 +840,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
|
||||
F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
|
||||
F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
|
||||
F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
|
||||
F src/where.c fee27468ac2d50e79c65fb31dcdfd0ed194a8cc20824bdca476df7b03b56d8cd
|
||||
F src/where.c 5ddff7d4e0c0f7a2616efc126e4b8224387ce5fa4f5adf0737c8daa3e83824cf
|
||||
F src/whereInt.h 002adc3aa2cc10733b9b27958fdbe893987cd989fab25a9853941c1f9b9b0a65
|
||||
F src/wherecode.c d5184620bcb5265d59072cb66e1386bfe0331a9ce7614286f9ab79a4fcd00fb8
|
||||
F src/whereexpr.c 67d15caf88a1a9528283d68ff578e024cf9fe810b517bb0343e5aaf695ad97dd
|
||||
@@ -2194,8 +2194,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 c08dd245f7706f2fd2269d700be480477619a722e27e6b439462ae543302c49f
|
||||
R 72c04f74ef51a04b1a629955fe9bd59f
|
||||
U stephan
|
||||
Z 89260005431ea7f0523c5c606191a398
|
||||
P ee92fa8366b743266b17c692499087c0d11b9302d096c3dfb4e6356b467e939e
|
||||
R 26b2d1af00d15dbbae9294d17198b2cc
|
||||
U drh
|
||||
Z 06aea7a30f870e0d4619820ebd6e3381
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
ee92fa8366b743266b17c692499087c0d11b9302d096c3dfb4e6356b467e939e
|
||||
a47c644fef71f3ab3dc584ea917eaab9a8e5b4c9dcb57bdd29747ba32108e85f
|
||||
+1
-1
@@ -6644,7 +6644,7 @@ WhereInfo *sqlite3WhereBegin(
|
||||
if( db->mallocFailed ) goto whereBeginError;
|
||||
if( pWInfo->pOrderBy ){
|
||||
whereInterstageHeuristic(pWInfo);
|
||||
wherePathSolver(pWInfo, pWInfo->nRowOut+1);
|
||||
wherePathSolver(pWInfo, pWInfo->nRowOut<0 ? 1 : pWInfo->nRowOut+1);
|
||||
if( db->mallocFailed ) goto whereBeginError;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user