database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-19 21:43:15 +03:00
Code Activity

Fix the constructAutomaticIndex() routine so that it works with NGQP.

Browse Source 
FossilOrigin-Name: 5e1e61399513b4a95fd93df2377a2603f1670063
This commit is contained in:
drh
2013-05-31 11:57:39 +00:00
parent dc3cd4b020
commit 53b52f7f2e
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/where.c
View File

@@ -1850,6 +1850,7 @@ static void constructAutomaticIndex(
WhereLoop *pLoop; /* The Loop object */
Bitmask idxCols; /* Bitmap of columns used for indexing */
Bitmask extraCols; /* Bitmap of additional columns */
const int mxConstraint = 10; /* Maximum number of constraints */
/* Generate code to skip over the creation and initialization of the
** transient index on 2nd and subsequent iterations of the loop. */
@@ -1864,20 +1865,25 @@ static void constructAutomaticIndex(
pWCEnd = &pWC->a[pWC->nTerm];
pLoop = pLevel->pWLoop;
idxCols = 0;
for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
pLoop->aTerm = sqlite3DbRealloc(pParse->db, pLoop->aTerm,
mxConstraint*sizeof(pLoop->aTerm[0]));
if( pLoop->aTerm==0 ) return;
for(pTerm=pWC->a; pTerm<pWCEnd && pLoop->nTerm<mxConstraint; pTerm++){
if( termCanDriveIndex(pTerm, pSrc, notReady) ){
int iCol = pTerm->u.leftColumn;
Bitmask cMask = iCol>=BMS ? ((Bitmask)1)<<(BMS-1) : ((Bitmask)1)<<iCol;
testcase( iCol==BMS );
testcase( iCol==BMS-1 );
if( (idxCols & cMask)==0 ){
nColumn++;
pLoop->aTerm[nColumn++] = pTerm;
idxCols |= cMask;
}
}
}
assert( nColumn>0 );
pLoop->u.btree.nEq = nColumn;
pLoop->u.btree.nEq = pLoop->nTerm = nColumn;
pLoop->wsFlags = WHERE_COLUMN_EQ | WHERE_IDX_ONLY | WHERE_INDEXED
| WHERE_TEMP_INDEX;
/* Count the number of additional columns needed to create a
** covering index. A "covering index" is an index that contains all