Index: ext/fts5/fts5_index.c ================================================================== --- ext/fts5/fts5_index.c +++ ext/fts5/fts5_index.c @@ -264,10 +264,11 @@ typedef struct Fts5BtreeIter Fts5BtreeIter; typedef struct Fts5BtreeIterLevel Fts5BtreeIterLevel; typedef struct Fts5ChunkIter Fts5ChunkIter; typedef struct Fts5Data Fts5Data; +typedef struct Fts5DlidxIter Fts5DlidxIter; typedef struct Fts5MultiSegIter Fts5MultiSegIter; typedef struct Fts5NodeIter Fts5NodeIter; typedef struct Fts5PageWriter Fts5PageWriter; typedef struct Fts5PendingDoclist Fts5PendingDoclist; typedef struct Fts5PendingPoslist Fts5PendingPoslist; @@ -276,11 +277,10 @@ typedef struct Fts5DoclistIter Fts5DoclistIter; typedef struct Fts5SegWriter Fts5SegWriter; typedef struct Fts5Structure Fts5Structure; typedef struct Fts5StructureLevel Fts5StructureLevel; typedef struct Fts5StructureSegment Fts5StructureSegment; - /* ** One object per %_data table. */ struct Fts5Index { @@ -319,10 +319,13 @@ i64 iRowid; u8 *aPoslist; int nPoslist; }; +/* +** Each iterator used by external modules is an instance of this type. +*/ struct Fts5IndexIter { Fts5Index *pIndex; Fts5Structure *pStruct; Fts5MultiSegIter *pMulti; Fts5DoclistIter *pDoclist; @@ -487,10 +490,12 @@ /* The following are only used if the FTS5_SEGITER_REVERSE flag is set. */ int iRowidOffset; /* Current entry in aRowidOffset[] */ int nRowidOffset; /* Allocated size of aRowidOffset[] array */ int *aRowidOffset; /* Array of offset to rowid fields */ + Fts5DlidxIter *pDlidx; /* If there is a doclist-index */ + /* Variables populated based on current entry. */ Fts5Buffer term; /* Current term */ i64 iRowid; /* Current rowid */ }; @@ -537,10 +542,30 @@ Fts5Buffer term; int nEmpty; int iChild; int bDlidx; }; + +/* +** An instance of the following type is used to iterate through the contents +** of a doclist-index record. +** +** pData: +** A reference to the dlidx record. +*/ +struct Fts5DlidxIter { + Fts5Data *pData; /* Data for doclist index, if any */ + int iOff; /* Current offset into pDlidx */ + int bRowidValid; /* iRowid is valid */ + int bEof; /* At EOF already */ + + /* Output variables */ + int iLeafPgno; /* Page number of current leaf page */ + int bZero; /* True if current leaf has no rowids */ + i64 iRowid; /* If bZero==0, first rowid on leaf */ +}; + /* ** An Fts5BtreeIter object is used to iterate through all entries in the ** b-tree hierarchy belonging to a single fts5 segment. In this case the ** "b-tree hierarchy" is all b-tree nodes except leaves. Each entry in the @@ -574,10 +599,59 @@ int iLeaf; /* Leaf containing terms >= current term */ int nEmpty; /* Number of "empty" leaves following iLeaf */ int bEof; /* Set to true at EOF */ int bDlidx; /* True if there exists a dlidx */ }; + + +/* +** Decode a segment-data rowid from the %_data table. This function is +** the opposite of macro FTS5_SEGMENT_ROWID(). +*/ +static void fts5DecodeRowid( + i64 iRowid, /* Rowid from %_data table */ + int *piIdx, /* OUT: Index */ + int *piSegid, /* OUT: Segment id */ + int *piHeight, /* OUT: Height */ + int *piPgno /* OUT: Page number */ +){ + *piPgno = (int)(iRowid & (((i64)1 << FTS5_DATA_PAGE_B) - 1)); + iRowid >>= FTS5_DATA_PAGE_B; + + *piHeight = (int)(iRowid & (((i64)1 << FTS5_DATA_HEIGHT_B) - 1)); + iRowid >>= FTS5_DATA_HEIGHT_B; + + *piSegid = (int)(iRowid & (((i64)1 << FTS5_DATA_ID_B) - 1)); + iRowid >>= FTS5_DATA_ID_B; + + *piIdx = (int)(iRowid & (((i64)1 << FTS5_DATA_IDX_B) - 1)); +} + +static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){ + int iIdx,iSegid,iHeight,iPgno; /* Rowid compenents */ + fts5DecodeRowid(iKey, &iIdx, &iSegid, &iHeight, &iPgno); + + if( iSegid==0 ){ + if( iKey==FTS5_AVERAGES_ROWID ){ + sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "(averages) "); + }else{ + sqlite3Fts5BufferAppendPrintf(pRc, pBuf, + "(structure idx=%d)", (int)(iKey-10) + ); + } + } + else if( iHeight==FTS5_SEGMENT_MAX_HEIGHT ){ + sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "(dlidx idx=%d segid=%d pgno=%d)", + iIdx, iSegid, iPgno + ); + }else{ + sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "(idx=%d segid=%d h=%d pgno=%d)", + iIdx, iSegid, iHeight, iPgno + ); + } +} + static void fts5PutU16(u8 *aOut, u16 iVal){ aOut[0] = (iVal>>8); aOut[1] = (iVal&0xFF); } @@ -664,11 +738,19 @@ Fts5Buffer *pBuf, i64 iRowid ){ Fts5Data *pRet = 0; if( p->rc==SQLITE_OK ){ - int rc; + int rc = SQLITE_OK; + +#if 0 +Fts5Buffer buf = {0,0,0}; +fts5DebugRowid(&rc, &buf, iRowid); +fprintf(stdout, "read: %s\n", buf.p); +fflush(stdout); +sqlite3_free(buf.p); +#endif /* If the blob handle is not yet open, open and seek it. Otherwise, use ** the blob_reopen() API to reseek the existing blob handle. */ if( p->pReader==0 ){ Fts5Config *pConfig = p->pConfig; @@ -1038,10 +1120,119 @@ ** Free any memory allocated by the iterator object. */ static void fts5NodeIterFree(Fts5NodeIter *pIter){ fts5BufferFree(&pIter->term); } + +/* +** Return non-zero if EOF is reached. +*/ +static int fts5DlidxIterNext(Fts5DlidxIter *pIter, int bRev){ + if( bRev ){ + i64 iVal; + int iOff = pIter->iOff; + int iLimit; + u8 *a = pIter->pData->p; + + /* Currently iOff points to the first byte of a varint. This block + ** decrements iOff until it points to the first byte of the previous + ** varint. Taking care not to read any memory locations that occur + ** before the buffer in memory. */ + iLimit = (iOff>9 ? iOff-9 : 0); + for(iOff--; iOff>iLimit; iOff--){ + if( (a[iOff-1] & 0x80)==0 ) break; + } + pIter->iOff = iOff; + + if( iOff<=0 ){ + pIter->bEof = 1; + return 1; + } + + getVarint(&a[iOff], (u64*)&iVal); + if( iVal==0 ){ + pIter->bZero = 1; + }else if( iOff==0 ){ + pIter->iRowid = iVal; + }else{ + pIter->iRowid += iVal; + } + pIter->iLeafPgno--; + }else{ + i64 iVal; + if( pIter->iOff>=pIter->pData->n ){ + pIter->bEof = 1; + return 1; + } + pIter->iOff += getVarint(&pIter->pData->p[pIter->iOff], (u64*)&iVal); + if( iVal==0 ){ + pIter->bZero = 1; + }else{ + pIter->bZero = 0; + if( pIter->bRowidValid ){ + pIter->iRowid -= iVal; + }else{ + pIter->bRowidValid = 1; + pIter->iRowid = iVal; + } + } + pIter->iLeafPgno++; + } + return 0; +} + +static void fts5DlidxIterLast(Fts5DlidxIter *pIter){ + while( 0==fts5DlidxIterNext(pIter, 0) ); + assert( pIter->iOff==pIter->pData->n && pIter->bEof==1 ); + pIter->bEof = 0; +} + +static int fts5DlidxIterEof(Fts5Index *p, Fts5DlidxIter *pIter){ + return (p->rc!=SQLITE_OK || pIter->bEof); +} + +static void fts5DlidxIterInit( + Fts5Index *p, /* Fts5 Backend to iterate within */ + int bRev, /* True for ORDER BY ASC */ + int iIdx, int iSegid, /* Segment iSegid within index iIdx */ + int iLeafPgno, /* Leaf page number to load dlidx for */ + Fts5DlidxIter **ppIter /* OUT: Populated iterator */ +){ + Fts5DlidxIter *pIter = *ppIter; + Fts5Data *pDlidx; + + pDlidx = fts5DataRead(p, FTS5_DOCLIST_IDX_ROWID(iIdx, iSegid, iLeafPgno)); + if( pDlidx==0 ) return; + if( pIter==0 ){ + *ppIter = pIter = (Fts5DlidxIter*)fts5IdxMalloc(p, sizeof(Fts5DlidxIter)); + if( pIter==0 ){ + fts5DataRelease(pDlidx); + return; + } + }else{ + memset(pIter, 0, sizeof(Fts5DlidxIter)); + } + + pIter->pData = pDlidx; + + pIter->iLeafPgno = iLeafPgno; + if( bRev==0 ){ + fts5DlidxIterNext(pIter, 0); + }else{ + fts5DlidxIterLast(pIter); + } +} + +/* +** Free a doclist-index iterator object allocated by fts5DlidxIterInit(). +*/ +static void fts5DlidxIterFree(Fts5DlidxIter *pIter){ + if( pIter ){ + fts5DataRelease(pIter->pData); + sqlite3_free(pIter); + } +} /* ** Load the next leaf page into the segment iterator. */ static void fts5SegIterNextPage( @@ -1173,10 +1364,54 @@ pIter->iLeafOffset = i; } pIter->iRowidOffset = iRowidOffset; } +/* +** +*/ +static void fts5SegIterReverseNewPage(Fts5Index *p, Fts5SegIter *pIter){ + assert( pIter->flags & FTS5_SEGITER_REVERSE ); + assert( pIter->flags & FTS5_SEGITER_ONETERM ); + + fts5DataRelease(pIter->pLeaf); + pIter->pLeaf = 0; + while( p->rc==SQLITE_OK && pIter->iLeafPgno>pIter->iTermLeafPgno ){ + Fts5Data *pNew; + pIter->iLeafPgno--; + pNew = fts5DataRead(p, FTS5_SEGMENT_ROWID( + pIter->iIdx, pIter->pSeg->iSegid, 0, pIter->iLeafPgno + )); + if( pNew ){ + if( pIter->iLeafPgno==pIter->iTermLeafPgno ){ + if( pIter->iTermLeafOffsetn ){ + pIter->pLeaf = pNew; + pIter->iLeafOffset = pIter->iTermLeafOffset; + } + }else{ + int iRowidOff, dummy; + fts5LeafHeader(pNew, &iRowidOff, &dummy); + if( iRowidOff ){ + pIter->pLeaf = pNew; + pIter->iLeafOffset = iRowidOff; + } + } + + if( pIter->pLeaf ){ + u8 *a = &pIter->pLeaf->p[pIter->iLeafOffset]; + pIter->iLeafOffset += getVarint(a, (u64*)&pIter->iRowid); + break; + }else{ + fts5DataRelease(pNew); + } + } + } + + if( pIter->pLeaf ){ + fts5SegIterReverseInitPage(p, pIter); + } +} /* ** Advance iterator pIter to the next entry. ** ** If an error occurs, Fts5Index.rc is set to an appropriate error code. It @@ -1200,10 +1435,12 @@ iOff += getVarint32(&a[iOff], nPos); iOff += nPos; getVarint(&a[iOff], (u64*)&iDelta); pIter->iRowid += iDelta; }else{ + fts5SegIterReverseNewPage(p, pIter); +#if 0 fts5DataRelease(pIter->pLeaf); pIter->pLeaf = 0; while( p->rc==SQLITE_OK && pIter->iLeafPgno>pIter->iTermLeafPgno ){ Fts5Data *pNew; pIter->iLeafPgno--; @@ -1236,10 +1473,11 @@ } if( pIter->pLeaf ){ fts5SegIterReverseInitPage(p, pIter); } +#endif } }else{ Fts5Data *pLeaf = pIter->pLeaf; int iOff; int bNewTerm = 0; @@ -1377,10 +1615,46 @@ } fts5SegIterReverseInitPage(p, pIter); pIter->flags |= FTS5_SEGITER_REVERSE; } + +/* +** Iterator pIter currently points to the first rowid of a doclist within +** index iIdx. There is a doclist-index associated with the final term on +** the current page. If the current term is the last term on the page, +** load the doclist-index from disk and initialize an iterator at +** (pIter->pDlidx). +*/ +static void fts5SegIterLoadDlidx(Fts5Index *p, int iIdx, Fts5SegIter *pIter){ + int iSegid = pIter->pSeg->iSegid; + int bRev = (pIter->flags & FTS5_SEGITER_REVERSE); + Fts5Data *pLeaf = pIter->pLeaf; /* Current leaf data */ + int iOff = pIter->iLeafOffset; /* Byte offset within current leaf */ + + assert( pIter->flags & FTS5_SEGITER_ONETERM ); + assert( pIter->pDlidx==0 ); + + /* Check if the current doclist ends on this page. If it does, return + ** early without loading the doclist-index (as it belongs to a different + ** term. */ + while( iOffn ){ + i64 iDelta; + int nPoslist; + + /* iOff is currently the offset of the size field of a position list. */ + iOff += getVarint32(&pLeaf->p[iOff], nPoslist); + iOff += nPoslist; + + if( iOffn ){ + iOff += getVarint(&pLeaf->p[iOff], (u64*)&iDelta); + if( iDelta==0 ) return; + } + } + + fts5DlidxIterInit(p, bRev, iIdx, iSegid, pIter->iLeafPgno, &pIter->pDlidx); +} /* ** Initialize the object pIter to point to term pTerm/nTerm within segment ** pSeg, index iIdx. If there is no such term in the index, the iterator ** is set to EOF. @@ -1397,10 +1671,11 @@ Fts5SegIter *pIter /* Object to populate */ ){ int iPg = 1; int h; int bGe = ((flags & FTS5INDEX_QUERY_PREFIX) && iIdx==0); + int bDlidx = 0; /* True if there is a doclist-index */ assert( bGe==0 || (flags & FTS5INDEX_QUERY_ASC)==0 ); assert( pTerm && nTerm ); memset(pIter, 0, sizeof(*pIter)); pIter->pSeg = pSeg; @@ -1416,22 +1691,25 @@ fts5NodeIterInit(pNode->p, pNode->n, &node); assert( node.term.n==0 ); iPg = node.iChild; + bDlidx = node.bDlidx; for(fts5NodeIterNext(&p->rc, &node); node.aData && fts5BufferCompareBlob(&node.term, pTerm, nTerm)<=0; fts5NodeIterNext(&p->rc, &node) ){ iPg = node.iChild; + bDlidx = node.bDlidx; } fts5NodeIterFree(&node); fts5DataRelease(pNode); } if( iPgpgnoFirst ){ iPg = pSeg->pgnoFirst; + bDlidx = 0; } pIter->iLeafPgno = iPg - 1; fts5SegIterNextPage(p, pIter); @@ -1452,12 +1730,17 @@ } } if( bGe==0 ){ pIter->flags |= FTS5_SEGITER_ONETERM; - if( pIter->pLeaf && (flags & FTS5INDEX_QUERY_ASC) ){ - fts5SegIterReverse(p, iIdx, pIter); + if( pIter->pLeaf ){ + if( bDlidx ){ + fts5SegIterLoadDlidx(p, iIdx, pIter); + } + if( flags & FTS5INDEX_QUERY_ASC ){ + fts5SegIterReverse(p, iIdx, pIter); + } } } } /* @@ -1464,10 +1747,11 @@ ** Zero the iterator passed as the only argument. */ static void fts5SegIterClear(Fts5SegIter *pIter){ fts5BufferFree(&pIter->term); fts5DataRelease(pIter->pLeaf); + fts5DlidxIterFree(pIter->pDlidx); sqlite3_free(pIter->aRowidOffset); memset(pIter, 0, sizeof(Fts5SegIter)); } /* @@ -1548,22 +1832,110 @@ fts5SegIterNext(p, &pIter->aSeg[iEq]); i = pIter->nSeg + iEq; } } } + +/* +** Move the seg-iter so that it points to the first rowid on page iLeafPgno. +** It is an error if leaf iLeafPgno contains no rowid. +*/ +static void fts5SegIterGotoPage( + Fts5Index *p, /* FTS5 backend object */ + Fts5SegIter *pIter, /* Iterator to advance */ + int iLeafPgno +){ + assert( iLeafPgno>pIter->iLeafPgno ); + if( p->rc==SQLITE_OK ){ + pIter->iLeafPgno = iLeafPgno-1; + fts5SegIterNextPage(p, pIter); + assert( p->rc!=SQLITE_OK || pIter->iLeafPgno==iLeafPgno ); + } + + if( p->rc==SQLITE_OK ){ + int iOff; + u8 *a = pIter->pLeaf->p; + int n = pIter->pLeaf->n; + + iOff = fts5GetU16(&a[0]); + if( iOff<4 || iOff>=n ){ + p->rc = FTS5_CORRUPT; + }else{ + iOff += getVarint(&a[iOff], (u64*)&pIter->iRowid); + pIter->iLeafOffset = iOff; + } + } +} + +/* +** Advance the iterator passed as the second argument until it is at or +** past rowid iFrom. Regardless of the value of iFrom, the iterator is +** always advanced at least once. +*/ +static void fts5SegIterNextFrom( + Fts5Index *p, /* FTS5 backend object */ + Fts5SegIter *pIter, /* Iterator to advance */ + i64 iMatch /* Advance iterator at least this far */ +){ + int bRev = (pIter->flags & FTS5_SEGITER_REVERSE); + Fts5DlidxIter *pDlidx = pIter->pDlidx; + int iLeafPgno = pIter->iLeafPgno; + + assert( pIter->flags & FTS5_SEGITER_ONETERM ); + assert( pIter->pDlidx ); + assert( pIter->pLeaf ); + + + if( bRev==0 ){ + while( fts5DlidxIterEof(p, pDlidx)==0 && iMatchiRowid ){ + if( pDlidx->bZero==0 ) iLeafPgno = pDlidx->iLeafPgno; + fts5DlidxIterNext(pDlidx, 0); + } + assert( iLeafPgno>=pIter->iLeafPgno || p->rc ); + if( iLeafPgno>pIter->iLeafPgno ){ + fts5SegIterGotoPage(p, pIter, iLeafPgno); + } + }else if( 0 ){ + while( fts5DlidxIterEof(p, pDlidx)==0 && iMatch>pDlidx->iRowid ){ + fts5DlidxIterNext(pDlidx, 0); + if( pDlidx->bZero==0 ) iLeafPgno = pDlidx->iLeafPgno; + } + assert( iLeafPgno<=pIter->iLeafPgno || p->rc ); + if( iLeafPgnoiLeafPgno ){ + fts5SegIterGotoPage(p, pIter, iLeafPgno); + } + } + + while( 1 ){ + fts5SegIterNext(p, pIter); + if( pIter->pLeaf==0 ) break; + if( bRev==0 && pIter->iRowid<=iMatch ) break; + if( bRev!=0 && pIter->iRowid>=iMatch ) break; + } +} /* ** Move the iterator to the next entry. ** ** If an error occurs, an error code is left in Fts5Index.rc. It is not ** considered an error if the iterator reaches EOF, or if it is already at ** EOF when this function is called. */ -static void fts5MultiIterNext(Fts5Index *p, Fts5MultiSegIter *pIter){ +static void fts5MultiIterNext( + Fts5Index *p, + Fts5MultiSegIter *pIter, + int bFrom, /* True if argument iFrom is valid */ + i64 iFrom /* Advance at least as far as this */ +){ if( p->rc==SQLITE_OK ){ int iFirst = pIter->aFirst[1]; - fts5SegIterNext(p, &pIter->aSeg[iFirst]); + Fts5SegIter *pSeg = &pIter->aSeg[iFirst]; + if( bFrom && pSeg->pDlidx ){ + fts5SegIterNextFrom(p, pSeg, iFrom); + }else{ + fts5SegIterNext(p, pSeg); + } fts5MultiIterAdvanced(p, pIter, iFirst, 1); } } /* @@ -1680,11 +2052,11 @@ Fts5MultiSegIter *pIter, i64 iMatch ){ while( 1 ){ i64 iRowid; - fts5MultiIterNext(p, pIter); + fts5MultiIterNext(p, pIter, 1, iMatch); if( fts5MultiIterEof(p, pIter) ) break; iRowid = fts5MultiIterRowid(pIter); if( pIter->bRev==0 && iRowid<=iMatch ) break; if( pIter->bRev!=0 && iRowid>=iMatch ) break; } @@ -2587,11 +2959,11 @@ fflush(stdout); #endif for(fts5MultiIterNew(p, pStruct, iIdx, 0, 0, 0, iLvl, nInput, &pIter); fts5MultiIterEof(p, pIter)==0; - fts5MultiIterNext(p, pIter) + fts5MultiIterNext(p, pIter, 0, 0) ){ Fts5SegIter *pSeg = &pIter->aSeg[ pIter->aFirst[1] ]; Fts5ChunkIter sPos; /* Used to iterate through position list */ int nTerm; const u8 *pTerm = fts5MultiIterTerm(pIter, &nTerm); @@ -3003,40 +3375,11 @@ } sqlite3_free(pIter->aLvl); fts5BufferFree(&pIter->term); } -typedef struct DoclistIdxIter DoclistIdxIter; -struct DoclistIdxIter { - Fts5Data *pDlidx; /* Data for doclist index, if any */ - int iOff; /* Current offset into pDlidx */ - int bRowidValid; /* iRowid is valid */ - int bZero; /* True if current leaf has no rowid */ - i64 iRowid; /* If bZero==0, first rowid on leaf */ -}; - -/* -** Return non-zero if EOF is reached. -*/ -static int fts5IndexDoclistIterNext(DoclistIdxIter *pIter){ - i64 iVal; - if( pIter->iOff>=pIter->pDlidx->n ) return 1; - pIter->iOff += getVarint(&pIter->pDlidx->p[pIter->iOff], (u64*)&iVal); - if( iVal==0 ){ - pIter->bZero = 1; - }else{ - pIter->bZero = 0; - if( pIter->bRowidValid ){ - pIter->iRowid -= iVal; - }else{ - pIter->bRowidValid = 1; - pIter->iRowid = iVal; - } - } - return 0; -} static void fts5IndexIntegrityCheckSegment( Fts5Index *p, /* FTS5 backend object */ int iIdx, /* Index that pSeg is a part of */ Fts5StructureSegment *pSeg /* Segment to check internal consistency */ @@ -3050,11 +3393,10 @@ ){ i64 iRow; /* Rowid for this leaf */ Fts5Data *pLeaf; /* Data for this leaf */ int iOff; /* Offset of first term on leaf */ int i; /* Used to iterate through empty leaves */ - DoclistIdxIter dliter; /* For iterating through any doclist index */ /* If the leaf in question has already been trimmed from the segment, ** ignore this b-tree entry. Otherwise, load it into memory. */ if( iter.iLeafpgnoFirst ) continue; iRow = FTS5_SEGMENT_ROWID(iIdx, pSeg->iSegid, 0, iter.iLeaf); @@ -3077,69 +3419,54 @@ } } fts5DataRelease(pLeaf); if( p->rc ) break; - memset(&dliter, 0, sizeof(DoclistIdxIter)); - if( iter.bDlidx ){ - i64 iDlidxRowid = FTS5_DOCLIST_IDX_ROWID(iIdx, pSeg->iSegid, iter.iLeaf); - dliter.pDlidx = fts5DataRead(p, iDlidxRowid); - } /* Now check that the iter.nEmpty leaves following the current leaf ** (a) exist and (b) contain no terms. */ - for(i=1; i<=iter.nEmpty; i++){ + for(i=1; p->rc==SQLITE_OK && i<=iter.nEmpty; i++){ pLeaf = fts5DataRead(p, iRow+i); if( pLeaf && 0!=fts5GetU16(&pLeaf->p[2]) ){ p->rc = FTS5_CORRUPT; } - if( pLeaf && dliter.pDlidx ){ - if( fts5IndexDoclistIterNext(&dliter) ){ - p->rc = FTS5_CORRUPT; - }else{ + fts5DataRelease(pLeaf); + } + + /* If there is a doclist-index, check that it looks right. */ + if( iter.bDlidx ){ + Fts5DlidxIter *pDlidx = 0; /* For iterating through doclist index */ + int nEntry = 0; + int iSegid = pSeg->iSegid; + int bRev = 0; + + for(fts5DlidxIterInit(p, bRev, iIdx, iSegid, iter.iLeaf, &pDlidx); + fts5DlidxIterEof(p, pDlidx)==0; + fts5DlidxIterNext(pDlidx, bRev) + ){ + i64 iKey = FTS5_SEGMENT_ROWID(iIdx, iSegid, 0, pDlidx->iLeafPgno); + pLeaf = fts5DataRead(p, iKey); + if( pLeaf ){ int iRowidOff = fts5GetU16(&pLeaf->p[0]); - if( dliter.bZero ){ + if( pDlidx->bZero ){ if( iRowidOff!=0 ) p->rc = FTS5_CORRUPT; }else{ i64 iRowid; getVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid); - if( iRowid!=dliter.iRowid ) p->rc = FTS5_CORRUPT; - } - } - } - fts5DataRelease(pLeaf); - } - - /* There may (or may not be) a final entry in the doclist. The entry - ** is only present if the page following the nEmpty termless pages - ** (a) exists and (b) contains at least one rowid that is part of - ** the doclist. */ - if( dliter.pDlidx ){ - if( (iter.iLeaf + iter.nEmpty)==pSeg->pgnoLast ){ - /* The next page does not exist. So the iterator should be at EOF. */ - if( fts5IndexDoclistIterNext(&dliter)==0 ) p->rc = FTS5_CORRUPT; - }else{ - Fts5Data *pLeaf = fts5DataRead(p, iRow+i); - if( pLeaf ){ - int iRowidOff = fts5GetU16(&pLeaf->p[0]); - if( iRowidOff==0 ){ - if( fts5IndexDoclistIterNext(&dliter)==0 ) p->rc = FTS5_CORRUPT; - }else{ - if( fts5IndexDoclistIterNext(&dliter) ){ - p->rc = FTS5_CORRUPT; - }else{ - i64 iRowid; - getVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid); - if( iRowid!=dliter.iRowid ) p->rc = FTS5_CORRUPT; - } + if( iRowid!=pDlidx->iRowid ) p->rc = FTS5_CORRUPT; } fts5DataRelease(pLeaf); } + nEntry++; } + + /* Check that the doclist-index was the right length */ + if( p->rc==SQLITE_OK && nEntry!=iter.nEmpty && nEntry!=iter.nEmpty+1 ){ + p->rc = FTS5_CORRUPT; + } + fts5DlidxIterFree(pDlidx); } - - fts5DataRelease(dliter.pDlidx); } if( p->rc==SQLITE_OK && iter.iLeaf!=pSeg->pgnoLast ){ p->rc = FTS5_CORRUPT; } @@ -3167,11 +3494,11 @@ for(iIdx=0; iIdx<=pConfig->nPrefix; iIdx++){ Fts5MultiSegIter *pIter; Fts5Structure *pStruct = fts5StructureRead(p, iIdx); for(fts5MultiIterNew(p, pStruct, iIdx, 0, 0, 0, -1, 0, &pIter); fts5MultiIterEof(p, pIter)==0; - fts5MultiIterNext(p, pIter) + fts5MultiIterNext(p, pIter, 0, 0) ){ Fts5PosIter sPos; /* Used to iterate through position list */ int n; /* Size of term in bytes */ i64 iRowid = fts5MultiIterRowid(pIter); char *z = (char*)fts5MultiIterTerm(pIter, &n); @@ -3248,33 +3575,10 @@ } fts5StructureRelease(p); } -/* -** Decode a segment-data rowid from the %_data table. This function is -** the opposite of macro FTS5_SEGMENT_ROWID(). -*/ -static void fts5DecodeRowid( - i64 iRowid, /* Rowid from %_data table */ - int *piIdx, /* OUT: Index */ - int *piSegid, /* OUT: Segment id */ - int *piHeight, /* OUT: Height */ - int *piPgno /* OUT: Page number */ -){ - *piPgno = (int)(iRowid & (((i64)1 << FTS5_DATA_PAGE_B) - 1)); - iRowid >>= FTS5_DATA_PAGE_B; - - *piHeight = (int)(iRowid & (((i64)1 << FTS5_DATA_HEIGHT_B) - 1)); - iRowid >>= FTS5_DATA_HEIGHT_B; - - *piSegid = (int)(iRowid & (((i64)1 << FTS5_DATA_ID_B) - 1)); - iRowid >>= FTS5_DATA_ID_B; - - *piIdx = (int)(iRowid & (((i64)1 << FTS5_DATA_IDX_B) - 1)); -} - /* ** Buffer (a/n) is assumed to contain a list of serialized varints. Read ** each varint and append its string representation to buffer pBuf. Return ** after either the input buffer is exhausted or a 0 value is read. ** @@ -3329,11 +3633,11 @@ sqlite3_context *pCtx, /* Function call context */ int nArg, /* Number of args (always 2) */ sqlite3_value **apVal /* Function arguments */ ){ i64 iRowid; /* Rowid for record being decoded */ - int iIdx,iSegid,iHeight,iPgno; /* Rowid compenents */ + int iIdx,iSegid,iHeight,iPgno; /* Rowid components */ const u8 *a; int n; /* Record to decode */ Fts5Buffer s; /* Build up text to return here */ int rc = SQLITE_OK; /* Return code */ assert( nArg==2 ); @@ -3341,16 +3645,14 @@ iRowid = sqlite3_value_int64(apVal[0]); n = sqlite3_value_bytes(apVal[1]); a = sqlite3_value_blob(apVal[1]); fts5DecodeRowid(iRowid, &iIdx, &iSegid, &iHeight, &iPgno); + fts5DebugRowid(&rc, &s, iRowid); if( iHeight==FTS5_SEGMENT_MAX_HEIGHT ){ int i = 0; i64 iPrev; - sqlite3Fts5BufferAppendPrintf(&rc, &s, "(dlidx idx=%d segid=%d pgno=%d)", - iIdx, iSegid, iPgno - ); if( n>0 ){ i = getVarint(&a[i], (u64*)&iPrev); sqlite3Fts5BufferAppendPrintf(&rc, &s, " %lld", iPrev); } while( ipDoclist ){ fts5DoclistIterNext(pIter->pDoclist); }else{ fts5BufferZero(&pIter->poslist); - fts5MultiIterNext(pIter->pIndex, pIter->pMulti); + fts5MultiIterNext(pIter->pIndex, pIter->pMulti, 0, 0); } } /* ** Move to the next matching rowid that occurs at or after iMatch. The Index: test/fts5aa.test ================================================================== --- test/fts5aa.test +++ test/fts5aa.test @@ -48,11 +48,11 @@ INSERT INTO t1 VALUES('a b c', 'd e f'); } do_execsql_test 2.2 { SELECT fts5_decode(id, block) FROM t1_data WHERE id==10 } { - {{structure idx=0} {lvl=0 nMerge=0 {id=27723 h=1 leaves=1..1}}} + {(structure idx=0) {lvl=0 nMerge=0 {id=27723 h=1 leaves=1..1}}} } do_execsql_test 2.3 { INSERT INTO t1(t1) VALUES('integrity-check'); } @@ -180,11 +180,10 @@ set rowid [expr int(rand() * 100)] execsql { REPLACE INTO t1(rowid,x,y,z) VALUES($rowid, $x, $y, $z) } } execsql { INSERT INTO t1(t1) VALUES('integrity-check'); } } {} - if {[set_test_counter errors]} exit } #------------------------------------------------------------------------- # reset_db Index: test/fts5ah.test ================================================================== --- test/fts5ah.test +++ test/fts5ah.test @@ -53,18 +53,39 @@ db one {SELECT t1 FROM t1 WHERE t1 MATCH '*reads'} } do_test 1.4 { set nRead [reads] - db eval { SELECT rowid FROM t1 WHERE t1 MATCH 'x' } - set a [expr [reads] - $nRead] -} {} + execsql { SELECT rowid FROM t1 WHERE t1 MATCH 'x' } + set nReadX [expr [reads] - $nRead] + expr $nReadX>1000 +} {1} + +foreach {tn q res} " + 1 { SELECT rowid FROM t1 WHERE t1 MATCH 'w + x' } [list $W] + 2 { SELECT rowid FROM t1 WHERE t1 MATCH 'x + w' } [list $W] + 3 { SELECT rowid FROM t1 WHERE t1 MATCH 'x AND w' } [list $W] + 4 { SELECT rowid FROM t1 WHERE t1 MATCH 'y AND x' } [list $Y] +" { + + do_test 1.5.$tn.1 { + set nRead [reads] + execsql $q + set n [expr [reads] - $nRead] + expr {$n < ($nReadX / 10)} + } {1} + + do_test 1.5.$tn.2 { + set nRead [reads] + execsql "$q ORDER BY rowid ASC" + set n [expr [reads] - $nRead] + expr {$n < ($nReadX / 10)} + } {1} -do_test 1.5 { - set nRead [reads] - db eval { SELECT rowid FROM t1 WHERE t1 MATCH 'x + w' } - set a [expr [reads] - $nRead] -} {} + do_execsql_test 1.5.$tn.3 $q [lsort -int -decr $res] + do_execsql_test 1.5.$tn.4 "$q ORDER BY rowid ASC" [lsort -int -incr $res] +} +#db eval {SELECT rowid, fts5_decode(rowid, block) aS r FROM t1_data} {puts $r} finish_test