Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a broken assert() in the fts3 snippet code that was failing for queries containging more than 64 phrases. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
4c01e0170e113ad052b6c3980beb4be9 |
| User & Date: | dan 2019-08-21 11:31:48 |
Context
|
2019-08-21
| ||
| 14:54 | Avoid assuming that "column IS ?", where column is declared UNIQUE, matches only a single row (as "?" might be NULL). Fix for [b8689402]. check-in: d02490a2 user: dan tags: trunk | |
| 11:31 | Fix a broken assert() in the fts3 snippet code that was failing for queries containging more than 64 phrases. check-in: 4c01e017 user: dan tags: trunk | |
|
2019-08-20
| ||
| 19:11 | Fix a problem with fts5 "ORDER BY rank" queries when the fts5 table name requires quoting. check-in: 00e9a8f2 user: dan tags: trunk | |
Changes
Changes to ext/fts3/fts3_snippet.c.
429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 |
SnippetPhrase *pPhrase = &pIter->aPhrase[i];
if( pPhrase->pTail ){
char *pCsr = pPhrase->pTail;
int iCsr = pPhrase->iTail;
while( iCsr<(iStart+pIter->nSnippet) && iCsr>=iStart ){
int j;
u64 mPhrase = (u64)1 << i;
u64 mPos = (u64)1 << (iCsr - iStart);
assert( iCsr>=iStart && (iCsr - iStart)<=64 );
assert( i>=0 && i<=64 );
if( (mCover|mCovered)&mPhrase ){
iScore++;
}else{
iScore += 1000;
}
mCover |= mPhrase;
|
| | |
429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 |
SnippetPhrase *pPhrase = &pIter->aPhrase[i];
if( pPhrase->pTail ){
char *pCsr = pPhrase->pTail;
int iCsr = pPhrase->iTail;
while( iCsr<(iStart+pIter->nSnippet) && iCsr>=iStart ){
int j;
u64 mPhrase = (u64)1 << (i%64);
u64 mPos = (u64)1 << (iCsr - iStart);
assert( iCsr>=iStart && (iCsr - iStart)<=64 );
assert( i>=0 );
if( (mCover|mCovered)&mPhrase ){
iScore++;
}else{
iScore += 1000;
}
mCover |= mPhrase;
|
Changes to test/fts3snippet.test.
557 558 559 560 561 562 563 564 565 566 567 |
do_test 4.3 {
llength [db one {
SELECT snippet(t4, '', '', '', 0, 150) FROM t4 WHERE t4 MATCH 'E'
}]
} {64}
set sqlite_fts3_enable_parentheses 0
finish_test
|
> > | > > > > > > > > > > > > > > > > > > > > > > |
557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 |
do_test 4.3 {
llength [db one {
SELECT snippet(t4, '', '', '', 0, 150) FROM t4 WHERE t4 MATCH 'E'
}]
} {64}
#-------------------------------------------------------------------------
# Request a snippet from a query with more than 64 phrases.
#
do_execsql_test 5.0 {
CREATE VIRTUAL TABLE t5 USING fts3(x);
INSERT INTO t5 VALUES('a1 a2 a3');
INSERT INTO t5 VALUES('a4 a5 a6');
INSERT INTO t5 VALUES('a70 a71 a72');
}
do_execsql_test 5.1 {
SELECT snippet(t5, '[', ']') FROM t5 WHERE t5 MATCH
'a1 OR a2 OR a3 OR a4 OR a5 OR a6 OR a7 OR a8 OR a9 OR a10 OR ' ||
'a11 OR a12 OR a13 OR a14 OR a15 OR a16 OR a17 OR a18 OR a19 OR a10 OR ' ||
'a21 OR a22 OR a23 OR a24 OR a25 OR a26 OR a27 OR a28 OR a29 OR a20 OR ' ||
'a31 OR a32 OR a33 OR a34 OR a35 OR a36 OR a37 OR a38 OR a39 OR a30 OR ' ||
'a41 OR a42 OR a43 OR a44 OR a45 OR a46 OR a47 OR a48 OR a49 OR a40 OR ' ||
'a51 OR a52 OR a53 OR a54 OR a55 OR a56 OR a57 OR a58 OR a59 OR a50 OR ' ||
'a61 OR a62 OR a63 OR a64 OR a65 OR a66 OR a67 OR a68 OR a69 OR a60 OR ' ||
'a71 OR a72 OR a73 OR a74 OR a75 OR a76 OR a77 OR a78 OR a79 OR a70'
} {
{[a1] [a2] [a3]}
{[a4] [a5] [a6]}
{[a70] [a71] [a72]}
}
set sqlite_fts3_enable_parentheses 0
finish_test
|