Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add another test for the fts4 content= option. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
7e6007a0002f6989bd489abeba8db52a |
User & Date: | dan 2013-01-11 09:58:54.381 |
Context
2013-01-15
| ||
16:15 | Clarification to a comment in where.c. No code changes. (check-in: 04507c1763 user: drh tags: trunk) | |
2013-01-11
| ||
09:58 | Add another test for the fts4 content= option. (check-in: 7e6007a000 user: dan tags: trunk) | |
2013-01-09
| ||
15:44 | Check in an extra test for the fts4 "content=" option. No code changes. (check-in: 0d0e5ab8f1 user: dan tags: trunk) | |
Changes
Changes to main.mk.
︙ | ︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 | $(TOP)/src/test_autoext.c \ $(TOP)/src/test_async.c \ $(TOP)/src/test_backup.c \ $(TOP)/src/test_btree.c \ $(TOP)/src/test_config.c \ $(TOP)/src/test_demovfs.c \ $(TOP)/src/test_devsym.c \ $(TOP)/src/test_func.c \ $(TOP)/src/test_fuzzer.c \ $(TOP)/src/test_hexio.c \ $(TOP)/src/test_init.c \ $(TOP)/src/test_intarray.c \ $(TOP)/src/test_journal.c \ $(TOP)/src/test_malloc.c \ | > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | $(TOP)/src/test_autoext.c \ $(TOP)/src/test_async.c \ $(TOP)/src/test_backup.c \ $(TOP)/src/test_btree.c \ $(TOP)/src/test_config.c \ $(TOP)/src/test_demovfs.c \ $(TOP)/src/test_devsym.c \ $(TOP)/src/test_fs.c \ $(TOP)/src/test_func.c \ $(TOP)/src/test_fuzzer.c \ $(TOP)/src/test_hexio.c \ $(TOP)/src/test_init.c \ $(TOP)/src/test_intarray.c \ $(TOP)/src/test_journal.c \ $(TOP)/src/test_malloc.c \ |
︙ | ︙ |
Changes to src/tclsqlite.c.
︙ | ︙ | |||
3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 | extern int Sqlitetest_hexio_Init(Tcl_Interp*); extern int Sqlitetest_init_Init(Tcl_Interp*); extern int Sqlitetest_malloc_Init(Tcl_Interp*); extern int Sqlitetest_mutex_Init(Tcl_Interp*); extern int Sqlitetestschema_Init(Tcl_Interp*); extern int Sqlitetestsse_Init(Tcl_Interp*); extern int Sqlitetesttclvar_Init(Tcl_Interp*); extern int SqlitetestThread_Init(Tcl_Interp*); extern int SqlitetestOnefile_Init(); extern int SqlitetestOsinst_Init(Tcl_Interp*); extern int Sqlitetestbackup_Init(Tcl_Interp*); extern int Sqlitetestintarray_Init(Tcl_Interp*); extern int Sqlitetestvfs_Init(Tcl_Interp *); extern int Sqlitetestrtree_Init(Tcl_Interp*); | > | 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 | extern int Sqlitetest_hexio_Init(Tcl_Interp*); extern int Sqlitetest_init_Init(Tcl_Interp*); extern int Sqlitetest_malloc_Init(Tcl_Interp*); extern int Sqlitetest_mutex_Init(Tcl_Interp*); extern int Sqlitetestschema_Init(Tcl_Interp*); extern int Sqlitetestsse_Init(Tcl_Interp*); extern int Sqlitetesttclvar_Init(Tcl_Interp*); extern int Sqlitetestfs_Init(Tcl_Interp*); extern int SqlitetestThread_Init(Tcl_Interp*); extern int SqlitetestOnefile_Init(); extern int SqlitetestOsinst_Init(Tcl_Interp*); extern int Sqlitetestbackup_Init(Tcl_Interp*); extern int Sqlitetestintarray_Init(Tcl_Interp*); extern int Sqlitetestvfs_Init(Tcl_Interp *); extern int Sqlitetestrtree_Init(Tcl_Interp*); |
︙ | ︙ | |||
3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 | Sqlitetest_func_Init(interp); Sqlitetest_hexio_Init(interp); Sqlitetest_init_Init(interp); Sqlitetest_malloc_Init(interp); Sqlitetest_mutex_Init(interp); Sqlitetestschema_Init(interp); Sqlitetesttclvar_Init(interp); SqlitetestThread_Init(interp); SqlitetestOnefile_Init(interp); SqlitetestOsinst_Init(interp); Sqlitetestbackup_Init(interp); Sqlitetestintarray_Init(interp); Sqlitetestvfs_Init(interp); Sqlitetestrtree_Init(interp); | > | 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 | Sqlitetest_func_Init(interp); Sqlitetest_hexio_Init(interp); Sqlitetest_init_Init(interp); Sqlitetest_malloc_Init(interp); Sqlitetest_mutex_Init(interp); Sqlitetestschema_Init(interp); Sqlitetesttclvar_Init(interp); Sqlitetestfs_Init(interp); SqlitetestThread_Init(interp); SqlitetestOnefile_Init(interp); SqlitetestOsinst_Init(interp); Sqlitetestbackup_Init(interp); Sqlitetestintarray_Init(interp); Sqlitetestvfs_Init(interp); Sqlitetestrtree_Init(interp); |
︙ | ︙ |
Added src/test_fs.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 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 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | /* ** 2013 Jan 11 ** ** 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. ** ************************************************************************* ** Code for testing the virtual table interfaces. This code ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** ** The FS virtual table is created as follows: ** ** CREATE VIRTUAL TABLE tbl USING fs(idx); ** ** where idx is the name of a table in the db with 2 columns. The virtual ** table also has two columns - file path and file contents. ** ** The first column of table idx must be an IPK, and the second contains file ** paths. For example: ** ** CREATE TABLE idx(id INTEGER PRIMARY KEY, path TEXT); ** INSERT INTO idx VALUES(4, '/etc/passwd'); ** ** Adding the row to the idx table automatically creates a row in the ** virtual table with rowid=4, path=/etc/passwd and a text field that ** contains data read from file /etc/passwd on disk. */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> #ifndef SQLITE_OMIT_VIRTUALTABLE typedef struct fs_vtab fs_vtab; typedef struct fs_cursor fs_cursor; /* ** A fs virtual-table object */ struct fs_vtab { sqlite3_vtab base; sqlite3 *db; char *zDb; /* Name of db containing zTbl */ char *zTbl; /* Name of docid->file map table */ }; /* A fs cursor object */ struct fs_cursor { sqlite3_vtab_cursor base; sqlite3_stmt *pStmt; char *zBuf; int nBuf; int nAlloc; }; /* ** This function is the implementation of both the xConnect and xCreate ** methods of the fs virtual table. ** ** The argv[] array contains the following: ** ** argv[0] -> module name ("fs") ** argv[1] -> database name ** argv[2] -> table name ** argv[...] -> other module argument fields. */ static int fsConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ fs_vtab *pVtab; int nByte; const char *zTbl; const char *zDb = argv[1]; if( argc!=4 ){ *pzErr = sqlite3_mprintf("wrong number of arguments"); return SQLITE_ERROR; } zTbl = argv[3]; nByte = sizeof(fs_vtab) + strlen(zTbl) + 1 + strlen(zDb) + 1; pVtab = (fs_vtab *)sqlite3MallocZero( nByte ); if( !pVtab ) return SQLITE_NOMEM; pVtab->zTbl = (char *)&pVtab[1]; pVtab->zDb = &pVtab->zTbl[strlen(zTbl)+1]; pVtab->db = db; memcpy(pVtab->zTbl, zTbl, strlen(zTbl)); memcpy(pVtab->zDb, zDb, strlen(zDb)); *ppVtab = &pVtab->base; sqlite3_declare_vtab(db, "CREATE TABLE xyz(path TEXT, data TEXT)"); return SQLITE_OK; } /* Note that for this virtual table, the xCreate and xConnect ** methods are identical. */ static int fsDisconnect(sqlite3_vtab *pVtab){ sqlite3_free(pVtab); return SQLITE_OK; } /* The xDisconnect and xDestroy methods are also the same */ /* ** Open a new fs cursor. */ static int fsOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ fs_cursor *pCur; pCur = sqlite3MallocZero(sizeof(fs_cursor)); *ppCursor = &pCur->base; return SQLITE_OK; } /* ** Close a fs cursor. */ static int fsClose(sqlite3_vtab_cursor *cur){ fs_cursor *pCur = (fs_cursor *)cur; sqlite3_finalize(pCur->pStmt); sqlite3_free(pCur->zBuf); sqlite3_free(pCur); return SQLITE_OK; } static int fsNext(sqlite3_vtab_cursor *cur){ fs_cursor *pCur = (fs_cursor *)cur; int rc; rc = sqlite3_step(pCur->pStmt); if( rc==SQLITE_ROW || rc==SQLITE_DONE ) rc = SQLITE_OK; return rc; } static int fsFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ int rc; fs_cursor *pCur = (fs_cursor *)pVtabCursor; fs_vtab *p = (fs_vtab *)(pVtabCursor->pVtab); assert( (idxNum==0 && argc==0) || (idxNum==1 && argc==1) ); if( idxNum==1 ){ char *zStmt = sqlite3_mprintf( "SELECT * FROM %Q.%Q WHERE rowid=?", p->zDb, p->zTbl); if( !zStmt ) return SQLITE_NOMEM; rc = sqlite3_prepare_v2(p->db, zStmt, -1, &pCur->pStmt, 0); sqlite3_free(zStmt); if( rc==SQLITE_OK ){ sqlite3_bind_value(pCur->pStmt, 1, argv[0]); } }else{ char *zStmt = sqlite3_mprintf("SELECT * FROM %Q.%Q", p->zDb, p->zTbl); if( !zStmt ) return SQLITE_NOMEM; rc = sqlite3_prepare_v2(p->db, zStmt, -1, &pCur->pStmt, 0); sqlite3_free(zStmt); } if( rc==SQLITE_OK ){ rc = fsNext(pVtabCursor); } return rc; } static int fsColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ fs_cursor *pCur = (fs_cursor*)cur; assert( i==0 || i==1 ); if( i==0 ){ sqlite3_result_value(ctx, sqlite3_column_value(pCur->pStmt, 0)); }else{ const char *zFile = (const char *)sqlite3_column_text(pCur->pStmt, 1); struct stat sbuf; int fd; fd = open(zFile, O_RDONLY); if( fd<0 ) return SQLITE_IOERR; fstat(fd, &sbuf); if( sbuf.st_size>=pCur->nAlloc ){ int nNew = sbuf.st_size*2; char *zNew; if( nNew<1024 ) nNew = 1024; zNew = sqlite3Realloc(pCur->zBuf, nNew); if( zNew==0 ){ close(fd); return SQLITE_NOMEM; } pCur->zBuf = zNew; pCur->nAlloc = nNew; } read(fd, pCur->zBuf, sbuf.st_size); close(fd); pCur->nBuf = sbuf.st_size; pCur->zBuf[pCur->nBuf] = '\0'; sqlite3_result_text(ctx, pCur->zBuf, -1, SQLITE_TRANSIENT); } return SQLITE_OK; } static int fsRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){ fs_cursor *pCur = (fs_cursor*)cur; *pRowid = sqlite3_column_int64(pCur->pStmt, 0); return SQLITE_OK; } static int fsEof(sqlite3_vtab_cursor *cur){ fs_cursor *pCur = (fs_cursor*)cur; return (sqlite3_data_count(pCur->pStmt)==0); } static int fsBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ int ii; for(ii=0; ii<pIdxInfo->nConstraint; ii++){ struct sqlite3_index_constraint const *pCons = &pIdxInfo->aConstraint[ii]; if( pCons->iColumn<0 && pCons->usable && pCons->op==SQLITE_INDEX_CONSTRAINT_EQ ){ struct sqlite3_index_constraint_usage *pUsage; pUsage = &pIdxInfo->aConstraintUsage[ii]; pUsage->omit = 0; pUsage->argvIndex = 1; pIdxInfo->idxNum = 1; pIdxInfo->estimatedCost = 1.0; break; } } return SQLITE_OK; } /* ** A virtual table module that provides read-only access to a ** Tcl global variable namespace. */ static sqlite3_module fsModule = { 0, /* iVersion */ fsConnect, fsConnect, fsBestIndex, fsDisconnect, fsDisconnect, fsOpen, /* xOpen - open a cursor */ fsClose, /* xClose - close a cursor */ fsFilter, /* xFilter - configure scan constraints */ fsNext, /* xNext - advance a cursor */ fsEof, /* xEof - check for end of scan */ fsColumn, /* xColumn - read data */ fsRowid, /* xRowid - read data */ 0, /* xUpdate */ 0, /* xBegin */ 0, /* xSync */ 0, /* xCommit */ 0, /* xRollback */ 0, /* xFindMethod */ 0, /* xRename */ }; /* ** Decode a pointer to an sqlite3 object. */ extern int getDbPointer(Tcl_Interp *interp, const char *zA, sqlite3 **ppDb); /* ** Register the echo virtual table module. */ static int register_fs_module( ClientData clientData, /* Pointer to sqlite3_enable_XXX function */ Tcl_Interp *interp, /* The TCL interpreter that invoked this command */ int objc, /* Number of arguments */ Tcl_Obj *CONST objv[] /* Command arguments */ ){ sqlite3 *db; if( objc!=2 ){ Tcl_WrongNumArgs(interp, 1, objv, "DB"); return TCL_ERROR; } if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR; #ifndef SQLITE_OMIT_VIRTUALTABLE sqlite3_create_module(db, "fs", &fsModule, (void *)interp); #endif return TCL_OK; } #endif /* ** Register commands with the TCL interpreter. */ int Sqlitetestfs_Init(Tcl_Interp *interp){ #ifndef SQLITE_OMIT_VIRTUALTABLE static struct { char *zName; Tcl_ObjCmdProc *xProc; void *clientData; } aObjCmd[] = { { "register_fs_module", register_fs_module, 0 }, }; int i; for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){ Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, aObjCmd[i].clientData, 0); } #endif return TCL_OK; } |
Changes to test/fts4content.test.
︙ | ︙ | |||
557 558 559 560 561 562 563 | do_execsql_test 9.6 { INSERT INTO ft1(ft1) VALUES('rebuild'); SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a' } {1 {a b} {c d} 2 {e f} {a b}} | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | do_execsql_test 9.6 { INSERT INTO ft1(ft1) VALUES('rebuild'); SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a' } {1 {a b} {c d} 2 {e f} {a b}} #------------------------------------------------------------------------- # Test cases 10.* # reset_db register_fs_module [sqlite3_connection_pointer db] proc write_file {path text} { set fd [open $path w] puts -nonewline $fd $text close $fd } write_file t1.txt {a b c d e f g h i j k l m n o p q r s t u v w x y z} write_file t2.txt {a b c d e f g h i j k l m a b c d e f g h i j k l m} write_file t3.txt {n o p q r s t u v w x y z n o p q r s t u v w x y z} do_execsql_test 10.1 { CREATE TABLE idx(id INTEGER PRIMARY KEY, path TEXT); INSERT INTO idx VALUES (1, 't1.txt'); INSERT INTO idx VALUES (2, 't2.txt'); INSERT INTO idx VALUES (3, 't3.txt'); CREATE VIRTUAL TABLE vt USING fs(idx); SELECT * FROM vt; } { 1 {a b c d e f g h i j k l m n o p q r s t u v w x y z} 2 {a b c d e f g h i j k l m a b c d e f g h i j k l m} 3 {n o p q r s t u v w x y z n o p q r s t u v w x y z} } do_execsql_test 10.2 { SELECT * FROM vt WHERE rowid = 2; } { 2 {a b c d e f g h i j k l m a b c d e f g h i j k l m} } do_execsql_test 10.3 { CREATE VIRTUAL TABLE ft USING fts4(content=vt); INSERT INTO ft(ft) VALUES('rebuild'); } do_execsql_test 10.4 { SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 'e' } { {...c d [e] f g...} {...c d [e] f g...} } do_execsql_test 10.5 { SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 't' } { {...r s [t] u v...} {...r s [t] u v...} } do_execsql_test 10.6 { DELETE FROM ft WHERE docid=2 } do_execsql_test 10.7 { SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 'e' } { {...c d [e] f g...} } finish_test |