database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Completely disable the skip-ahead-distinct optimization for all but the

Browse Source 
inner-most loop of a DISTINCT join.  Fix for ticket [ef9318757b152e3a26e9592]

FossilOrigin-Name: b7595cf2cadcba486e60b3c230ccc412a7cf449c1d56cbe65869e6d5d9f1374d
This commit is contained in:
drh
2017-11-23 00:45:21 +00:00
parent 065b34f6e5
commit fa337cc115
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/where.c
View File

@@ -4962,6 +4962,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
Index *pIdx;
int n;
if( pWInfo->eDistinct==WHERE_DISTINCT_ORDERED
&& i==pWInfo->nLevel-1 /* Ticket [ef9318757b152e3] 2017-10-21 */
&& (pLoop->wsFlags & WHERE_INDEXED)!=0
&& (pIdx = pLoop->u.btree.pIndex)->hasStat1
&& (n = pLoop->u.btree.nIdxCol)>0
@@ -4978,13 +4979,6 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
VdbeCoverageIf(v, op==OP_SeekLT);
VdbeCoverageIf(v, op==OP_SeekGT);
sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
if( i<pWInfo->nLevel-1 ){
/* Ticket https://sqlite.org/src/info/ef9318757b152e3 2017-11-21
** The break location for the next inner loop is above the code
** generated here, but it should be afterwards. So call re-resolve
** the break location to be afterwards. */
sqlite3VdbeResolveLabel(v, pWInfo->a[i+1].addrBrk);
}
}
#endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
/* The common case: Advance to the next row */