Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a bug in fts4 to do with matchinfo and deferred tokens. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
30d42dc66f19ef5cc5b27d6273eadf56 |
| User & Date: | dan 2011-03-23 17:10:44 |
Context
|
2011-03-23
| ||
| 18:22 | Increase the upper bound on SQLITE_MAX_ATTACHED from 30 to 62. check-in: 7aaf8772 user: drh tags: trunk | |
| 17:10 | Fix a bug in fts4 to do with matchinfo and deferred tokens. check-in: 30d42dc6 user: dan tags: trunk | |
| 11:16 | In the shell, make sure the ".log" command has at least one argument. check-in: 1ed5e361 user: drh tags: trunk | |
Changes
Changes to ext/fts3/fts3_snippet.c.
876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 |
*/
static int fts3ExprLocalHitsCb(
Fts3Expr *pExpr, /* Phrase expression node */
int iPhrase, /* Phrase number */
void *pCtx /* Pointer to MatchInfo structure */
){
MatchInfo *p = (MatchInfo *)pCtx;
if( pExpr->aDoclist ){
char *pCsr;
int iStart = iPhrase * p->nCol * 3;
int i;
for(i=0; i<p->nCol; i++) p->aMatchinfo[iStart+i*3] = 0;
pCsr = sqlite3Fts3FindPositions(pExpr, p->pCursor->iPrevId, -1);
if( pCsr ){
fts3LoadColumnlistCounts(&pCsr, &p->aMatchinfo[iStart], 0);
}
}
|
> > > > < < < < |
876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 |
*/
static int fts3ExprLocalHitsCb(
Fts3Expr *pExpr, /* Phrase expression node */
int iPhrase, /* Phrase number */
void *pCtx /* Pointer to MatchInfo structure */
){
MatchInfo *p = (MatchInfo *)pCtx;
int iStart = iPhrase * p->nCol * 3;
int i;
for(i=0; i<p->nCol; i++) p->aMatchinfo[iStart+i*3] = 0;
if( pExpr->aDoclist ){
char *pCsr;
pCsr = sqlite3Fts3FindPositions(pExpr, p->pCursor->iPrevId, -1);
if( pCsr ){
fts3LoadColumnlistCounts(&pCsr, &p->aMatchinfo[iStart], 0);
}
}
|
Changes to test/fts3defer2.test.
76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
# Test cases fts3defer2-2.* focus specifically on the matchinfo function.
#
do_execsql_test 2.1.1 "CREATE VIRTUAL TABLE t2 USING fts4"
do_execsql_test 2.1.2 "INSERT INTO t2 VALUES('[string repeat {a } 10000]')"
do_execsql_test 2.1.3 "INSERT INTO t2 VALUES('b [string repeat {z } 10000]')"
do_execsql_test 2.1.4 [string repeat "INSERT INTO t2 VALUES('x');" 50]
do_execsql_test 2.1.5 {
INSERT INTO t2 VALUES('a b c d e f g');
INSERT INTO t2 VALUES('a b c d e f g');
}
foreach {tn sql} {
1 {}
2 { INSERT INTO t2(t2) VALUES('optimize') }
3 { UPDATE t2_segments SET block = zeroblob(length(block))
WHERE length(block)>10000;
}
} {
execsql $sql
do_execsql_test 2.2.$tn {
SELECT mit(matchinfo(t2, 'pcxnal')) FROM t2 WHERE t2 MATCH 'a b';
} [list \
[list 2 1 1 54 54 1 3 3 54 372 7] \
[list 2 1 1 54 54 1 3 3 54 372 7] \
]
}
do_execsql_test 2.3.1 {
CREATE VIRTUAL TABLE t3 USING fts4;
INSERT INTO t3 VALUES('a b c d e f');
INSERT INTO t3 VALUES('x b c d e f');
INSERT INTO t3 VALUES('d e f a b c');
|
| | | > > > > > > > > > |
76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 |
# Test cases fts3defer2-2.* focus specifically on the matchinfo function.
#
do_execsql_test 2.1.1 "CREATE VIRTUAL TABLE t2 USING fts4"
do_execsql_test 2.1.2 "INSERT INTO t2 VALUES('[string repeat {a } 10000]')"
do_execsql_test 2.1.3 "INSERT INTO t2 VALUES('b [string repeat {z } 10000]')"
do_execsql_test 2.1.4 [string repeat "INSERT INTO t2 VALUES('x');" 50]
do_execsql_test 2.1.5 {
INSERT INTO t2 VALUES('a b c d e f g z');
INSERT INTO t2 VALUES('a b c d e f g');
}
foreach {tn sql} {
1 {}
2 { INSERT INTO t2(t2) VALUES('optimize') }
3 { UPDATE t2_segments SET block = zeroblob(length(block))
WHERE length(block)>10000;
}
} {
execsql $sql
do_execsql_test 2.2.$tn.1 {
SELECT mit(matchinfo(t2, 'pcxnal')) FROM t2 WHERE t2 MATCH 'a b';
} [list \
[list 2 1 1 54 54 1 3 3 54 372 8] \
[list 2 1 1 54 54 1 3 3 54 372 7] \
]
set sqlite_fts3_enable_parentheses 1
do_execsql_test 2.2.$tn.2 {
SELECT mit(matchinfo(t2, 'x')) FROM t2 WHERE t2 MATCH 'g OR (g z)';
} [list \
[list 1 2 2 1 2 2 1 54 54] \
[list 1 2 2 1 2 2 0 54 54] \
]
set sqlite_fts3_enable_parentheses 0
}
do_execsql_test 2.3.1 {
CREATE VIRTUAL TABLE t3 USING fts4;
INSERT INTO t3 VALUES('a b c d e f');
INSERT INTO t3 VALUES('x b c d e f');
INSERT INTO t3 VALUES('d e f a b c');
|