Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Remove some dead code from fts5. Add auxiliary function api tests to the same. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | fts5 |
Files: | files | file ages | folders |
SHA1: |
0f9df202cc58097afddb8dad662b7c7f |
User & Date: | dan 2015-05-28 14:37:26.732 |
Context
2015-05-28
| ||
19:57 | Optimizations for fts5 queries that match against a specific column. (check-in: b29ac50af0 user: dan tags: fts5) | |
14:37 | Remove some dead code from fts5. Add auxiliary function api tests to the same. (check-in: 0f9df202cc user: dan tags: fts5) | |
2015-05-26
| ||
18:22 | Simplifications and minor optimizations to fts5 prefix queries that cannot use a prefix index. (check-in: aef89d9f6a user: dan tags: fts5) | |
Changes
Changes to ext/fts5/fts5_index.c.
︙ | |||
268 269 270 271 272 273 274 | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | - - - - - - - - - - - - - - - - - - | ((i64)(height) << (FTS5_DATA_PAGE_B)) + \ ((i64)(pgno)) \ ) #define FTS5_SEGMENT_ROWID(segid, height, pgno) fts5_dri(segid, 0, height, pgno) #define FTS5_DLIDX_ROWID(segid, height, pgno) fts5_dri(segid, 1, height, pgno) |
︙ | |||
768 769 770 771 772 773 774 | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | if( p->pReader ){ sqlite3_blob *pReader = p->pReader; p->pReader = 0; sqlite3_blob_close(pReader); } } |
︙ | |||
974 975 976 977 978 979 980 | 916 917 918 919 920 921 922 923 924 925 926 927 928 929 | - - - - - - - - - - - - - - | sqlite3_bind_int64(p->pDeleter, 1, iFirst); sqlite3_bind_int64(p->pDeleter, 2, iLast); sqlite3_step(p->pDeleter); p->rc = sqlite3_reset(p->pDeleter); } |
︙ | |||
3305 3306 3307 3308 3309 3310 3311 | 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 | - - - - - - - - - - - - - - - - | if( pPage->buf.n>=p->pConfig->pgsz ){ fts5WriteFlushLeaf(p, pWriter); } } } |
︙ | |||
3570 3571 3572 3573 3574 3575 3576 | 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 | - - - - - | pStruct->nSegment++; /* Read input from all segments in the input level */ nInput = pLvl->nSeg; } bOldest = (pLvlOut->nSeg==1 && pStruct->nLevel==iLvl+2); |
︙ |
Changes to ext/fts5/test/fts5aux.test.
︙ | |||
215 216 217 218 219 220 221 222 223 224 | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | + + + + + + + + + + + + + + + + + + + + | SELECT my_phrasesize(t1, -1), my_phrasesize(t1, 0), my_phrasesize(t1, 1), my_phrasesize(t1, 2) FROM t1 WHERE t1 MATCH 'a OR b+c' } {0 1 2 0} #------------------------------------------------------------------------- # do_execsql_test 8.0 { CREATE VIRTUAL TABLE x1 USING fts5(a); } foreach {tn lRow res} { 4 {"a a a" "b" "a d"} {"[a] [a] [a]" "[a] d"} 1 {"b d" "a b"} {"[b] [d]" "[a] b"} 2 {"d b" "a d"} {"[d] [b]" "[a] d"} 3 {"a a d"} {"[a] [a] d"} } { execsql { DELETE FROM x1 } foreach row $lRow { execsql { INSERT INTO x1 VALUES($row) } } breakpoint do_execsql_test 8.$tn { SELECT highlight(x1, 0, '[', ']') FROM x1 WHERE x1 MATCH 'a OR (b AND d)'; } $res } finish_test |
Changes to ext/fts5/test/fts5fault5.test.
︙ | |||
72 73 74 75 76 77 78 | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | - + - + | execsql { CREATE VIRTUAL TABLE tt USING fts5(x); CREATE VIRTUAL TABLE tv USING fts5vocab(tt, 'row'); INSERT INTO tt(tt, rank) VALUES('pgsz', 32); BEGIN; } for {set i 0} {$i < 20} {incr i} { |
︙ |