From: dan Date: Thu, 26 Apr 2018 17:43:35 +0000 (+0000) Subject: When processing an "ORDER BY ... LIMIT" that does not use an index, check X-Git-Tag: version-3.24.0~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c040e2b186a1795af7eb2eae9aec5020f9d706b0;p=thirdparty%2Fsqlite.git When processing an "ORDER BY ... LIMIT" that does not use an index, check whether or not a record may appear in the final result set before adding it to the temp b-tree used for sorting. FossilOrigin-Name: 0fcfc36ceb820fc70136b799a0405fe92e50646e697be2872bbe9a53a05ed5a9 --- c040e2b186a1795af7eb2eae9aec5020f9d706b0 diff --cc manifest index 11e53dfe69,21484880f4..d319175a99 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Ensure\sthat\snew.*\svalues\sof\san\sUPDATE\sdo\snot\sget\sclobbered\safter\sthe\nBEFORE\striggers\srun\swhen\sunmodified\scolumns\sof\sthe\srow\sbeing\supdated\sare\nreloaded.\s\sFix\sfor\sticket\s[d85fffd6ffe856092ed8da] - D 2018-04-26T15:50:10.476 -C When\sprocessing\san\s"ORDER\sBY\s...\sLIMIT"\sthat\sdoes\snot\suse\san\sindex,\scheck\nwhether\sor\snot\sa\srecord\smay\sappear\sin\sthe\sfinal\sresult\sset\sbefore\sadding\sit\sto\nthe\ssorter. -D 2018-04-26T16:13:47.273 ++C When\sprocessing\san\s"ORDER\sBY\s...\sLIMIT"\sthat\sdoes\snot\suse\san\sindex,\scheck\nwhether\sor\snot\sa\srecord\smay\sappear\sin\sthe\sfinal\sresult\sset\sbefore\sadding\sit\sto\nthe\stemp\sb-tree\sused\sfor\ssorting. ++D 2018-04-26T17:43:35.709 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 @@@ -1725,7 -1725,10 +1725,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 --P 7bb23c2a3d37f0d5e5515b917860818906819d54a0066e1ba8e9792a82f7d279 - R fca770ecccc439d6123031b9ede2b90c - U drh - Z 0f59500027b236c3f3feca2847bff4bf -R 6079da62ec760c692d1ac980ae12bf44 -T *branch * sorter-limit-opt -T *sym-sorter-limit-opt * -T -sym-trunk * ++P 0a514e62ad1ebe5c12da8daed429ae2f9d9910471d3c5cef3b6870bdadfefca1 71bf91c218334381b1b4bdba6a093e623b62e17f3e8550e154a11f0cb0b404f3 ++R 4228df14b2641be536d92a6cbe9f519e ++T +closed 71bf91c218334381b1b4bdba6a093e623b62e17f3e8550e154a11f0cb0b404f3 + U dan -Z 8f9d35d6b39a3409ee54166c5149a9b9 ++Z 8a2a73a40bbf3e885ec761eb0e674078 diff --cc manifest.uuid index 83dbc5ed7f,2cb0bbfb3c..9db48c2532 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 0a514e62ad1ebe5c12da8daed429ae2f9d9910471d3c5cef3b6870bdadfefca1 -71bf91c218334381b1b4bdba6a093e623b62e17f3e8550e154a11f0cb0b404f3 ++0fcfc36ceb820fc70136b799a0405fe92e50646e697be2872bbe9a53a05ed5a9