database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Improve the performance of fts5 column filters on detail=col tables.

Browse Source 
FossilOrigin-Name: 249a2d070c34bf884a04cb248b9691e239f2871c
This commit is contained in:
dan
2016-01-26 19:30:49 +00:00
parent fee981e5b9
commit 1c16bccb79
6 changed files with 117 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
ext/fts5/fts5_index.c
View File

@ -5003,6 +5003,53 @@ static void fts5IterSetOutputs_Nocolset(Fts5Iter *pIter, Fts5SegIter *pSeg){
}
}
/*
** xSetOutputs callback used when: detail=col when there is a column filter.
**
** * detail=col,
** * there is a column filter, and
** * the table contains 32 or fewer columns.
*/
static void fts5IterSetOutputs_Col32(Fts5Iter *pIter, Fts5SegIter *pSeg){
Fts5Colset *pColset = pIter->pColset;
pIter->base.iRowid = pSeg->iRowid;
assert( pIter->pIndex->pConfig->eDetail==FTS5_DETAIL_COLUMNS );
assert( pColset );
fts5BufferZero(&pIter->poslist);
if( pSeg->iLeafOffset+pSeg->nPos<=pSeg->pLeaf->szLeaf ){
int i;
int iPrev = 0;
u32 m = 0;
u8 *a = (u8*)&pSeg->pLeaf->p[pSeg->iLeafOffset];
u8 *pEnd = (u8*)&a[pSeg->nPos];
while( a<pEnd ){
iPrev += (int)a[0] - 2;
m |= (1 << iPrev);
a++;
}
iPrev = 0;
a = pIter->poslist.p;
for(i=0; i<pColset->nCol; i++){
int iCol = pColset->aiCol[i];
if( m & (1 << iCol) ){
*a++ = (iCol - iPrev) + 2;
iPrev = iCol;
}
}
pIter->poslist.n = a - pIter->poslist.p;
}else{
fts5SegiterPoslist(pIter->pIndex, pSeg, pColset, &pIter->poslist);
}
pIter->base.pData = pIter->poslist.p;
pIter->base.nData = pIter->poslist.n;
}
/*
** xSetOutputs callback used by detail=col when there is a column filter.
*/
@ -5083,9 +5130,9 @@ static void fts5IterSetOutputs_Full(Fts5Iter *pIter, Fts5SegIter *pSeg){
}
}
static void fts5IterSetOutputCb(Fts5Iter *pIter){
int eDetail = pIter->pIndex->pConfig->eDetail;
if( eDetail==FTS5_DETAIL_NONE ){
static void fts5IterSetOutputCb(int *pRc, Fts5Iter *pIter){
Fts5Config *pConfig = pIter->pIndex->pConfig;
if( pConfig->eDetail==FTS5_DETAIL_NONE ){
pIter->xSetOutputs = fts5IterSetOutputs_None;
}
@ -5093,13 +5140,18 @@ static void fts5IterSetOutputCb(Fts5Iter *pIter){
pIter->xSetOutputs = fts5IterSetOutputs_Nocolset;
}
else if( eDetail==FTS5_DETAIL_FULL ){
else if( pConfig->eDetail==FTS5_DETAIL_FULL ){
pIter->xSetOutputs = fts5IterSetOutputs_Full;
}
else{
assert( eDetail==FTS5_DETAIL_COLUMNS );
pIter->xSetOutputs = fts5IterSetOutputs_Col;
assert( pConfig->eDetail==FTS5_DETAIL_COLUMNS );
if( pConfig->nCol<=32 ){
pIter->xSetOutputs = fts5IterSetOutputs_Col32;
sqlite3Fts5BufferSize(pRc, &pIter->poslist, pConfig->nCol);
}else{
pIter->xSetOutputs = fts5IterSetOutputs_Col;
}
}
}
@ -5166,8 +5218,8 @@ int sqlite3Fts5IndexQuery(
if( p->rc==SQLITE_OK ){
Fts5SegIter *pSeg = &pRet->aSeg[pRet->aFirst[1].iFirst];
pRet->pColset = pColset;
fts5IterSetOutputCb(pRet);
if( pSeg->pLeaf ) pRet->xSetOutputs(pRet, pSeg);
fts5IterSetOutputCb(&p->rc, pRet);
if( p->rc==SQLITE_OK && pSeg->pLeaf ) pRet->xSetOutputs(pRet, pSeg);
}
if( p->rc ){
sqlite3Fts5IterClose(&pRet->base);