Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove a duplicated "if" condition from fts3.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | ee348b12754abda1fe13231c1868faca9d78481c |
| User & Date: | dan 2015-07-25 19:26:52 |
Context
|
2015-07-27
| ||
| 12:19 | Merge the fts5-btree-index branch with this one. FTS5 changes only. check-in: 9f1dcdc3 user: dan tags: trunk | |
| 10:46 | Merge latest trunk changes with this branch. check-in: 5ec933c2 user: dan tags: fts5-btree-index | |
|
2015-07-25
| ||
| 19:26 | Remove a duplicated "if" condition from fts3.c. check-in: ee348b12 user: dan tags: trunk | |
| 14:26 | Fix the rowallock.test script so that it works with builds that do not support mmap mode. check-in: 7efed578 user: dan tags: trunk | |
Changes
Changes to ext/fts3/fts3.c.
4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 |
** possible if the bOptOk argument is true, the FTS doclists will be
** scanned in forward order, and the phrase consists of
** MAX_INCR_PHRASE_TOKENS or fewer tokens, none of which are are "^first"
** tokens or prefix tokens that cannot use a prefix-index. */
int bHaveIncr = 0;
int bIncrOk = (bOptOk
&& pCsr->bDesc==pTab->bDescIdx
&& p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
&& p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
#ifdef SQLITE_TEST
&& pTab->bNoIncrDoclist==0
#endif
);
for(i=0; bIncrOk==1 && i<p->nToken; i++){
Fts3PhraseToken *pToken = &p->aToken[i];
|
< |
4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 |
** possible if the bOptOk argument is true, the FTS doclists will be
** scanned in forward order, and the phrase consists of
** MAX_INCR_PHRASE_TOKENS or fewer tokens, none of which are are "^first"
** tokens or prefix tokens that cannot use a prefix-index. */
int bHaveIncr = 0;
int bIncrOk = (bOptOk
&& pCsr->bDesc==pTab->bDescIdx
&& p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
#ifdef SQLITE_TEST
&& pTab->bNoIncrDoclist==0
#endif
);
for(i=0; bIncrOk==1 && i<p->nToken; i++){
Fts3PhraseToken *pToken = &p->aToken[i];
|