Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add further tests for the extension APIs with "ORDER BY rank" queries. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | fts5 |
Files: | files | file ages | folders |
SHA1: |
37a417d27e4ebafd4783f62728d74673 |
User & Date: | dan 2014-07-31 11:57:59.052 |
Context
2014-07-31
| ||
17:53 | Add a comment explaining why fts5 cannot cache "sorter statements". (check-in: e6af3b7a3c user: dan tags: fts5) | |
17:47 | Try to reuse sorter statements in fts5. Does not work due to circular references on VTable object. (Leaf check-in: bc14e64bdf user: dan tags: save_sorter_stmt) | |
11:57 | Add further tests for the extension APIs with "ORDER BY rank" queries. (check-in: 37a417d27e user: dan tags: fts5) | |
2014-07-30
| ||
20:26 | Fix things so that the fts5 extension API works with "ORDER BY rank" queries. (check-in: f1b4e1a98d user: dan tags: fts5) | |
Changes
Changes to ext/fts5/fts5.c.
︙ | ︙ | |||
61 62 63 64 65 66 67 | struct Fts5MatchPhrase { Fts5Buffer *pPoslist; /* Pointer to current poslist */ int nTerm; /* Size of phrase in terms */ }; /* | < | > > > > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | struct Fts5MatchPhrase { Fts5Buffer *pPoslist; /* Pointer to current poslist */ int nTerm; /* Size of phrase in terms */ }; /* ** pStmt: ** SELECT rowid, <fts> FROM <fts> ORDER BY +rank; ** ** aIdx[]: ** There is one entry in the aIdx[] array for each phrase in the query, ** the value of which is the offset within aPoslist[] following the last ** byte of the position list for the corresponding phrase. */ struct Fts5Sorter { sqlite3_stmt *pStmt; i64 iRowid; /* Current rowid */ const u8 *aPoslist; /* Position lists for current row */ int nIdx; /* Number of entries in aIdx[] */ int aIdx[0]; /* Offsets into aPoslist for current row */ }; /* ** Virtual-table cursor object. */ struct Fts5Cursor { sqlite3_vtab_cursor base; /* Base class used by SQLite core */ int idxNum; /* idxNum passed to xFilter() */ |
︙ | ︙ | |||
404 405 406 407 408 409 410 411 412 413 414 415 416 417 | rc = SQLITE_OK; CsrFlagSet(pCsr, FTS5CSR_EOF); }else if( rc==SQLITE_ROW ){ const u8 *a; const u8 *aBlob; int nBlob; int i; rc = SQLITE_OK; pSorter->iRowid = sqlite3_column_int64(pSorter->pStmt, 0); nBlob = sqlite3_column_bytes(pSorter->pStmt, 1); aBlob = a = sqlite3_column_blob(pSorter->pStmt, 1); for(i=0; i<(pSorter->nIdx-1); i++){ | > > | > > > | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | rc = SQLITE_OK; CsrFlagSet(pCsr, FTS5CSR_EOF); }else if( rc==SQLITE_ROW ){ const u8 *a; const u8 *aBlob; int nBlob; int i; int iOff = 0; rc = SQLITE_OK; pSorter->iRowid = sqlite3_column_int64(pSorter->pStmt, 0); nBlob = sqlite3_column_bytes(pSorter->pStmt, 1); aBlob = a = sqlite3_column_blob(pSorter->pStmt, 1); for(i=0; i<(pSorter->nIdx-1); i++){ int iVal; a += getVarint32(a, iVal); iOff += iVal; pSorter->aIdx[i] = iOff; } pSorter->aIdx[i] = &aBlob[nBlob] - a; pSorter->aPoslist = a; CsrFlagSet(pCsr, FTS5CSR_REQUIRE_CONTENT | FTS5CSR_REQUIRE_DOCSIZE ); } return rc; } |
︙ | ︙ | |||
476 477 478 479 480 481 482 483 484 485 486 487 488 489 | char *zSql; nPhrase = sqlite3Fts5ExprPhraseCount(pCsr->pExpr); nByte = sizeof(Fts5Sorter) + sizeof(int) * nPhrase; pSorter = (Fts5Sorter*)sqlite3_malloc(nByte); if( pSorter==0 ) return SQLITE_NOMEM; memset(pSorter, 0, nByte); zSql = sqlite3_mprintf("SELECT rowid, %s FROM %Q.%Q ORDER BY +%s %s", pConfig->zName, pConfig->zDb, pConfig->zName, FTS5_RANK_NAME, bAsc ? "ASC" : "DESC" ); if( zSql==0 ){ rc = SQLITE_NOMEM; | > | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 | char *zSql; nPhrase = sqlite3Fts5ExprPhraseCount(pCsr->pExpr); nByte = sizeof(Fts5Sorter) + sizeof(int) * nPhrase; pSorter = (Fts5Sorter*)sqlite3_malloc(nByte); if( pSorter==0 ) return SQLITE_NOMEM; memset(pSorter, 0, nByte); pSorter->nIdx = nPhrase; zSql = sqlite3_mprintf("SELECT rowid, %s FROM %Q.%Q ORDER BY +%s %s", pConfig->zName, pConfig->zDb, pConfig->zName, FTS5_RANK_NAME, bAsc ? "ASC" : "DESC" ); if( zSql==0 ){ rc = SQLITE_NOMEM; |
︙ | ︙ | |||
807 808 809 810 811 812 813 | static int fts5ApiPhraseSize(Fts5Context *pCtx, int iPhrase){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; return sqlite3Fts5ExprPhraseSize(pCsr->pExpr, iPhrase); } static sqlite3_int64 fts5ApiRowid(Fts5Context *pCtx){ | < | 817 818 819 820 821 822 823 824 825 826 827 828 829 830 | static int fts5ApiPhraseSize(Fts5Context *pCtx, int iPhrase){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; return sqlite3Fts5ExprPhraseSize(pCsr->pExpr, iPhrase); } static sqlite3_int64 fts5ApiRowid(Fts5Context *pCtx){ return fts5CursorRowid((Fts5Cursor*)pCtx); } static int fts5ApiColumnText( Fts5Context *pCtx, int iCol, const char **pz, |
︙ | ︙ | |||
853 854 855 856 857 858 859 | int *pi, i64 *piPos ){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; const u8 *a; int n; /* Poslist for phrase iPhrase */ if( pCsr->pSorter ){ Fts5Sorter *pSorter = pCsr->pSorter; | | | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | int *pi, i64 *piPos ){ Fts5Cursor *pCsr = (Fts5Cursor*)pCtx; const u8 *a; int n; /* Poslist for phrase iPhrase */ if( pCsr->pSorter ){ Fts5Sorter *pSorter = pCsr->pSorter; int i1 = (iPhrase==0 ? 0 : pSorter->aIdx[iPhrase-1]); n = pSorter->aIdx[iPhrase] - i1; a = &pSorter->aPoslist[i1]; }else{ n = sqlite3Fts5ExprPoslist(pCsr->pExpr, iPhrase, &a); } return sqlite3Fts5PoslistNext64(a, n, pi, piPos); } |
︙ | ︙ | |||
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 | char *zErr = sqlite3_mprintf("no such cursor: %lld", iCsrId); sqlite3_result_error(context, zErr, -1); }else{ fts5ApiInvoke(pAux, pCsr, context, argc-1, &argv[1]); } } static int fts5PoslistBlob(sqlite3_context *pCtx, Fts5Cursor *pCsr){ int i; int rc = SQLITE_OK; int nPhrase = sqlite3Fts5ExprPhraseCount(pCsr->pExpr); Fts5Buffer val; | > > > > > > > > > > > > > > > < > > | < | > > | 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 | char *zErr = sqlite3_mprintf("no such cursor: %lld", iCsrId); sqlite3_result_error(context, zErr, -1); }else{ fts5ApiInvoke(pAux, pCsr, context, argc-1, &argv[1]); } } /* ** Return a "position-list blob" corresponding to the current position of ** cursor pCsr via sqlite3_result_blob(). A position-list blob contains ** the current position-list for each phrase in the query associated with ** cursor pCsr. ** ** A position-list blob begins with (nPhrase-1) varints, where nPhrase is ** the number of phrases in the query. Following the varints are the ** concatenated position lists for each phrase, in order. ** ** The first varint (if it exists) contains the size of the position list ** for phrase 0. The second (same disclaimer) contains the size of position ** list 1. And so on. There is no size field for the final position list, ** as it can be derived from the total size of the blob. */ static int fts5PoslistBlob(sqlite3_context *pCtx, Fts5Cursor *pCsr){ int i; int rc = SQLITE_OK; int nPhrase = sqlite3Fts5ExprPhraseCount(pCsr->pExpr); Fts5Buffer val; memset(&val, 0, sizeof(Fts5Buffer)); /* Append the varints */ for(i=0; i<(nPhrase-1); i++){ const u8 *dummy; int nByte = sqlite3Fts5ExprPoslist(pCsr->pExpr, i, &dummy); sqlite3Fts5BufferAppendVarint(&rc, &val, nByte); } /* Append the position lists */ for(i=0; i<nPhrase; i++){ const u8 *pPoslist; int nPoslist; nPoslist = sqlite3Fts5ExprPoslist(pCsr->pExpr, i, &pPoslist); sqlite3Fts5BufferAppendBlob(&rc, &val, nPoslist, pPoslist); } |
︙ | ︙ |
Changes to ext/fts5/fts5_aux.c.
︙ | ︙ | |||
755 756 757 758 759 760 761 | rc = pApi->xColumnTotalSize(pFts, i, &colsz); sqlite3Fts5BufferAppendPrintf(&rc, &s, "%s%d", i==0?"":" ", colsz); } if( zReq==0 && nCol>1 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, "}"); } if( zReq==0 ){ | | | | | 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 | rc = pApi->xColumnTotalSize(pFts, i, &colsz); sqlite3Fts5BufferAppendPrintf(&rc, &s, "%s%d", i==0?"":" ", colsz); } if( zReq==0 && nCol>1 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, "}"); } if( zReq==0 ){ sqlite3Fts5BufferAppendPrintf(&rc, &s, " columncount "); } if( 0==zReq || 0==sqlite3_stricmp(zReq, "columncount") ){ sqlite3Fts5BufferAppendPrintf(&rc, &s, "%d", nCol); } if( zReq==0 ){ sqlite3Fts5BufferAppendPrintf(&rc, &s, " columnsize "); } if( 0==zReq || 0==sqlite3_stricmp(zReq, "columnsize") ){ if( zReq==0 && nCol>1 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, "{"); for(i=0; rc==SQLITE_OK && i<nCol; i++){ int colsz = 0; rc = pApi->xColumnSize(pFts, i, &colsz); sqlite3Fts5BufferAppendPrintf(&rc, &s, "%s%d", i==0?"":" ", colsz); } if( zReq==0 && nCol>1 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, "}"); } if( zReq==0 ){ sqlite3Fts5BufferAppendPrintf(&rc, &s, " columntext "); } if( 0==zReq || 0==sqlite3_stricmp(zReq, "columntext") ){ for(i=0; rc==SQLITE_OK && i<nCol; i++){ const char *z; int n; rc = pApi->xColumnText(pFts, i, &z, &n); if( i!=0 ) sqlite3Fts5BufferAppendPrintf(&rc, &s, " "); |
︙ | ︙ |
Added test/fts5ag.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 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 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | # 2014 June 17 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #************************************************************************* # This file implements regression tests for SQLite library. The # focus of this script is testing the FTS5 module. # set testdir [file dirname $argv0] source $testdir/tester.tcl set testprefix fts5ag # If SQLITE_ENABLE_FTS3 is defined, omit this file. ifcapable !fts3 { finish_test return } #------------------------------------------------------------------------- # This file attempts to verify that the extension APIs work with # "ORDER BY rank" queries. This is done by comparing the results of # the fts5_test() function when run with queries of the form: # # ... WHERE fts MATCH ? ORDER BY bm25(fts) [ASC|DESC] # # and # # ... WHERE fts MATCH ? ORDER BY rank [ASC|DESC] # do_execsql_test 1.0 { CREATE VIRTUAL TABLE t1 USING fts5(x, y, z); } do_test 1.1 { foreach {x y z} { {j s m y m r n l u k} {z k f u z g h s w g} {r n o s s b v n w w} {m v g n d x q r r s} {q t d a q a v l h j} {s k l f s i n v q v} {m f f d h h s o h a} {y e v r q i u m h d} {b c k q m z l z h n} {j e m v k p e c j m} {m p v z d x l n i a} {v p u p m t p q i f} {v r w l e e t d z p} {c s b w k m n k o u} {w g y f v w v w v p} {k d g o u j p z n o} {t g e q l z i g b j} {f i q q j y h b g h} {j s w x o t j b t m} {v a v v r t x c q a} {r t k x w u l h a g} {j y b i u d e m d w} {y s o j h i n a u p} {n a g b u c w e b m} {b c k s c w j p w b} {m o c o w o b d q q} {n t y o y z y r z e} {p n q l e l h z q c} {n s e i h c v b b u} {m p d i t a o o f f} {k c o n v e z l b m} {s m n i n s d e s u} {t a u e q d a o u c} {h d t o i a g b b p} {k x c i g f g b b k} {x f i v n a n n j i} {f z k r b u s k z e} {n z v z w l e r h t} {t i s v v a v p n s} {k f e c t z r e f d} {f m g r c w q k b v} {v y s y f r b f e f} {z r c t d q q h x b} {u c g z n z u v s s} {y t n f f x b f d x} {u n p n u t i m e j} {p j j d m f k p m z} {d o l v c o e a h w} {h o q w t f v i c y} {c q u n r z s l l q} {z x a q w s b w s y} {y m s x k i m n x c} {b i a n v h z n k a} {w l q p b h h g d y} {z v s j f p v l f w} {c s b i z e k i g c} {x b v d w j f e d z} {r k k j e o m k g b} {h b d c h m y b t u} {u j s h k z c u d y} {v h i v s y z i k l} {d t m w q w c a z p} {r s e s x v d w k b} {u r e q j y h o o s} {x x z r x y t f j s} {k n h x i i u e c v} {q l f d a p w l q o} {y z q w j o p b o v} {s u h z h f d f n l} {q o e o x x l g q i} {j g m h q q w c d b} {o m d h w a g b f n} {m x k t s s y l v a} {j x t c a u w b w g} {n f j b v x y p u t} {u w k a q b u w k w} {a h j u o w f s k p} {j o f s h y t j h g} {x v b l m t l m h l} {t p y i y i q b q a} {k o o z w a c h c f} {j g c d k w b d t v} {a k v c m a v h v p} {i c a i j g h l j h} {l m v l c z j b p b} {z p z f l n k i b a} {j v q k g i x g i b} {m c i w u z m i s z} {i z r f n l q z k w} {x n b p b q r g i z} {d g i o o x l f x d} {r t m f b n q y c b} {i u g k w x n m p o} {t o s i q d z x d t} {v a k s q z j c o o} {z f n n r l y w v v} {w k h d t l j g n n} {r z m v y b l n c u} {v b v s c l n k g v} {m a g r a b u u n z} {u y l h v w v k b f} {x l p g i s j f x v} {v s g x k z a k a r} {l t g v j q l k p l} {f h n a x t v s t y} {z u v u x p s j y t} {g b q e e g l n w g} {e n p j i g j f u r} {q z l t w o l m p e} {t s g h r p r o t z} {y b f a o n u m z g} {d t w n y b o g f o} {d a j e r l g g s h} {d z e l w q l t h f} {f l u w q v x j a h} {f n u l l d m h h w} {d x c c e r o d q j} {b y f q s q f u l g} {u z w l f d b i a g} {m v q b g u o z e z} {h z p t s e x i v m} {l h q m e o x x x j} {e e d n p r m g j f} {k h s g o n s d a x} {u d t t s j o v h a} {z r b a e u v o e s} {m b b g a f c p a t} {w c m j o d b l g e} {f p j p m o s y v j} {c r n h d w c a b l} {s g e u s d n j b g} {b o n a x a b x y l} {r h u x f c d z n o} {x y l g u m i i w d} {t f h b z v r s r g} {t i o r b v g g p a} {d x l u q k m o s u} {j f h t u n z u k m} {g j t y d c n j y g} {w e s k v c w i g t} {g a h r g v g h r o} {e j l a q j g i n h} {d z k c u p n u p p} {t u e e v z v r r g} {l j s g k j k h z l} {p v d a t x d e q u} {r l u z b m g k s j} {i e y d u x d i n l} {p f z k m m w p u l} {z l p m r q w n d a} } { execsql { INSERT INTO t1 VALUES($x, $y, $z) } } set {} {} } {} proc do_fts5ag_test {tn E} { set q1 {SELECT fts5_test(t1) FROM t1 WHERE t1 MATCH $E ORDER BY rank} set q2 {SELECT fts5_test(t1) FROM t1 WHERE t1 MATCH $E ORDER BY bm25(t1)} set res [execsql $q1] set expected [execsql $q2] uplevel [list do_test $tn.1 [list set {} $res] $expected] append q1 " DESC" append q2 " DESC" set res [execsql $q1] set expected [execsql $q2] uplevel [list do_test $tn.2 [list set {} $res] $expected] } foreach {tn expr} { 2.1 a 2.2 b 2.3 c 2.4 d 2.5 {"m m"} 2.6 {e + s} 3.0 {a AND b} 3.1 {a OR b} 3.2 {b OR c AND d} 3.3 {NEAR(c d)} } { do_fts5ag_test $tn $expr if {[set_test_counter errors]} break } finish_test |
Changes to test/permutations.test.
︙ | ︙ | |||
222 223 224 225 226 227 228 | fts4growth.test fts4growth2.test } test_suite "fts5" -prefix "" -description { All FTS5 tests. } -files { fts5aa.test fts5ab.test fts5ac.test fts5ad.test fts5ae.test fts5ea.test | | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | fts4growth.test fts4growth2.test } test_suite "fts5" -prefix "" -description { All FTS5 tests. } -files { fts5aa.test fts5ab.test fts5ac.test fts5ad.test fts5ae.test fts5ea.test fts5af.test fts5ag.test } test_suite "nofaultsim" -prefix "" -description { "Very" quick test suite. Runs in less than 5 minutes on a workstation. This test suite is the same as the "quick" tests, except that some files that test malloc and IO errors are omitted. } -files [ |
︙ | ︙ |