Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Update test_fs.c to include a virtual table that reads a file-system hierarchy. Use it to further test GLOB and LIKE support for virtual tables. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6ef6578c03b7cfbeaaf3627b9eea2feb |
User & Date: | dan 2015-11-25 18:07:46.837 |
Context
2015-11-25
| ||
18:40 | Fix harmless compiler warnings in test_fs.c. Fix typos and clean up the text of the documentation for sqlite3_strglob() and sqlite3_strlike(). (check-in: 697b20534c user: drh tags: trunk) | |
18:07 | Update test_fs.c to include a virtual table that reads a file-system hierarchy. Use it to further test GLOB and LIKE support for virtual tables. (check-in: 6ef6578c03 user: dan tags: trunk) | |
18:03 | Make the xAccess method of the unix VFS smaller and faster. (check-in: 191aef986f user: drh tags: trunk) | |
Changes
Changes to src/test_fs.c.
︙ | ︙ | |||
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 | ** ** 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 <fcntl.h> #if SQLITE_OS_UNIX # include <unistd.h> #endif #if SQLITE_OS_WIN # include <io.h> #endif #ifndef SQLITE_OMIT_VIRTUALTABLE | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | ** ** 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. ** ************************************************************************* ** Virtual table module "fsdir" ** ** This module is designed to be used as a read-only eponymous virtual table. ** Its schema is as follows: ** ** CREATE TABLE fsdir(dir TEXT, name TEXT); ** ** When queried, a WHERE term of the form "dir = $dir" must be provided. The ** virtual table then appears to have one row for each entry in file-system ** directory $dir. Column dir contains a copy of $dir, and column "name" ** contains the name of the directory entry. ** ** If the specified $dir cannot be opened or is not a directory, it is not ** an error. The virtual table appears to be empty in this case. ** ************************************************************************* ** Virtual table module "fstree" ** ** This module is also a read-only eponymous virtual table with the ** following schema: ** ** CREATE TABLE fstree(path TEXT, size INT, data BLOB); ** ** Running a "SELECT * FROM fstree" query on this table returns the entire ** contents of the file-system, starting at "/". To restrict the search ** space, the virtual table supports LIKE and GLOB constraints on the ** 'path' column. For example: ** ** SELECT * FROM fstree WHERE path LIKE '/home/dan/sqlite/%' */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #if SQLITE_OS_UNIX # include <unistd.h> # include <dirent.h> #endif #if SQLITE_OS_WIN # include <io.h> #endif #ifndef SQLITE_OMIT_VIRTUALTABLE |
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 | 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: ** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 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 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | struct fs_cursor { sqlite3_vtab_cursor base; sqlite3_stmt *pStmt; char *zBuf; int nBuf; int nAlloc; }; /************************************************************************* ** Start of fsdir implementation. */ typedef struct FsdirVtab FsdirVtab; typedef struct FsdirCsr FsdirCsr; struct FsdirVtab { sqlite3_vtab base; }; struct FsdirCsr { sqlite3_vtab_cursor base; char *zDir; /* Buffer containing directory scanned */ DIR *pDir; /* Open directory */ sqlite3_int64 iRowid; struct dirent entry; /* Current entry */ }; /* ** This function is the implementation of both the xConnect and xCreate ** methods of the fsdir 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 fsdirConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ FsdirVtab *pTab; if( argc!=3 ){ *pzErr = sqlite3_mprintf("wrong number of arguments"); return SQLITE_ERROR; } pTab = (FsdirVtab *)sqlite3_malloc(sizeof(FsdirVtab)); if( !pTab ) return SQLITE_NOMEM; memset(pTab, 0, sizeof(FsdirVtab)); *ppVtab = &pTab->base; sqlite3_declare_vtab(db, "CREATE TABLE xyz(dir, name);"); return SQLITE_OK; } /* ** xDestroy/xDisconnect implementation. */ static int fsdirDisconnect(sqlite3_vtab *pVtab){ sqlite3_free(pVtab); return SQLITE_OK; } /* ** xBestIndex implementation. The only constraint supported is: ** ** (dir = ?) */ static int fsdirBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ int ii; pIdxInfo->estimatedCost = 1000000000.0; for(ii=0; ii<pIdxInfo->nConstraint; ii++){ struct sqlite3_index_constraint const *p = &pIdxInfo->aConstraint[ii]; if( p->iColumn==0 && p->usable && p->op==SQLITE_INDEX_CONSTRAINT_EQ ){ struct sqlite3_index_constraint_usage *pUsage; pUsage = &pIdxInfo->aConstraintUsage[ii]; pUsage->omit = 1; pUsage->argvIndex = 1; pIdxInfo->idxNum = 1; pIdxInfo->estimatedCost = 1.0; break; } } return SQLITE_OK; } /* ** xOpen implementation. ** ** Open a new fsdir cursor. */ static int fsdirOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ FsdirCsr *pCur; pCur = (FsdirCsr*)sqlite3_malloc(sizeof(FsdirCsr)); if( pCur==0 ) return SQLITE_NOMEM; memset(pCur, 0, sizeof(FsdirCsr)); *ppCursor = &pCur->base; return SQLITE_OK; } /* ** Close a fsdir cursor. */ static int fsdirClose(sqlite3_vtab_cursor *cur){ FsdirCsr *pCur = (FsdirCsr*)cur; if( pCur->pDir ) closedir(pCur->pDir); sqlite3_free(pCur->zDir); sqlite3_free(pCur); return SQLITE_OK; } /* ** Skip the cursor to the next entry. */ static int fsdirNext(sqlite3_vtab_cursor *cur){ FsdirCsr *pCsr = (FsdirCsr*)cur; if( pCsr->pDir ){ struct dirent *pRes = 0; readdir_r(pCsr->pDir, &pCsr->entry, &pRes); if( pRes==0 ){ closedir(pCsr->pDir); pCsr->pDir = 0; } pCsr->iRowid++; } return SQLITE_OK; } /* ** xFilter method implementation. */ static int fsdirFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ FsdirCsr *pCsr = (FsdirCsr*)pVtabCursor; int rc; const char *zDir; int nDir; if( idxNum!=1 || argc!=1 ){ return SQLITE_ERROR; } pCsr->iRowid = 0; sqlite3_free(pCsr->zDir); if( pCsr->pDir ){ closedir(pCsr->pDir); pCsr->pDir = 0; } zDir = (const char*)sqlite3_value_text(argv[0]); nDir = sqlite3_value_bytes(argv[0]); pCsr->zDir = sqlite3_malloc(nDir+1); if( pCsr->zDir==0 ) return SQLITE_NOMEM; memcpy(pCsr->zDir, zDir, nDir+1); pCsr->pDir = opendir(pCsr->zDir); return fsdirNext(pVtabCursor); } /* ** xEof method implementation. */ static int fsdirEof(sqlite3_vtab_cursor *cur){ FsdirCsr *pCsr = (FsdirCsr*)cur; return pCsr->pDir==0; } /* ** xColumn method implementation. */ static int fsdirColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ FsdirCsr *pCsr = (FsdirCsr*)cur; switch( i ){ case 0: /* dir */ sqlite3_result_text(ctx, pCsr->zDir, -1, SQLITE_STATIC); break; case 1: /* name */ sqlite3_result_text(ctx, pCsr->entry.d_name, -1, SQLITE_TRANSIENT); break; default: assert( 0 ); } return SQLITE_OK; } /* ** xRowid method implementation. */ static int fsdirRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){ FsdirCsr *pCsr = (FsdirCsr*)cur; *pRowid = pCsr->iRowid; return SQLITE_OK; } /* ** End of fsdir implementation. *************************************************************************/ /************************************************************************* ** Start of fstree implementation. */ typedef struct FstreeVtab FstreeVtab; typedef struct FstreeCsr FstreeCsr; struct FstreeVtab { sqlite3_vtab base; sqlite3 *db; }; struct FstreeCsr { sqlite3_vtab_cursor base; sqlite3_stmt *pStmt; /* Statement to list paths */ int fd; /* File descriptor open on current path */ }; /* ** This function is the implementation of both the xConnect and xCreate ** methods of the fstree 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 fstreeConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ FstreeVtab *pTab; if( argc!=3 ){ *pzErr = sqlite3_mprintf("wrong number of arguments"); return SQLITE_ERROR; } pTab = (FstreeVtab *)sqlite3_malloc(sizeof(FstreeVtab)); if( !pTab ) return SQLITE_NOMEM; memset(pTab, 0, sizeof(FstreeVtab)); pTab->db = db; *ppVtab = &pTab->base; sqlite3_declare_vtab(db, "CREATE TABLE xyz(path, size, data);"); return SQLITE_OK; } /* ** xDestroy/xDisconnect implementation. */ static int fstreeDisconnect(sqlite3_vtab *pVtab){ sqlite3_free(pVtab); return SQLITE_OK; } /* ** xBestIndex implementation. The only constraint supported is: ** ** (dir = ?) */ static int fstreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ int ii; for(ii=0; ii<pIdxInfo->nConstraint; ii++){ struct sqlite3_index_constraint const *p = &pIdxInfo->aConstraint[ii]; if( p->iColumn==0 && p->usable && ( p->op==SQLITE_INDEX_CONSTRAINT_GLOB || p->op==SQLITE_INDEX_CONSTRAINT_LIKE || p->op==SQLITE_INDEX_CONSTRAINT_EQ )){ struct sqlite3_index_constraint_usage *pUsage; pUsage = &pIdxInfo->aConstraintUsage[ii]; pIdxInfo->idxNum = p->op; pUsage->argvIndex = 1; pIdxInfo->estimatedCost = 100000.0; return SQLITE_OK; } } pIdxInfo->estimatedCost = 1000000000.0; return SQLITE_OK; } /* ** xOpen implementation. ** ** Open a new fstree cursor. */ static int fstreeOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ FstreeCsr *pCur; pCur = (FstreeCsr*)sqlite3_malloc(sizeof(FstreeCsr)); if( pCur==0 ) return SQLITE_NOMEM; memset(pCur, 0, sizeof(FstreeCsr)); pCur->fd = -1; *ppCursor = &pCur->base; return SQLITE_OK; } static void fstreeCloseFd(FstreeCsr *pCsr){ if( pCsr->fd>=0 ){ close(pCsr->fd); pCsr->fd = -1; } } /* ** Close a fstree cursor. */ static int fstreeClose(sqlite3_vtab_cursor *cur){ FstreeCsr *pCsr = (FstreeCsr*)cur; sqlite3_finalize(pCsr->pStmt); fstreeCloseFd(pCsr); sqlite3_free(pCsr); return SQLITE_OK; } /* ** Skip the cursor to the next entry. */ static int fstreeNext(sqlite3_vtab_cursor *cur){ FstreeCsr *pCsr = (FstreeCsr*)cur; int rc; fstreeCloseFd(pCsr); rc = sqlite3_step(pCsr->pStmt); if( rc!=SQLITE_ROW ){ rc = sqlite3_finalize(pCsr->pStmt); pCsr->pStmt = 0; }else{ rc = SQLITE_OK; pCsr->fd = open(sqlite3_column_text(pCsr->pStmt, 0), O_RDONLY); } return rc; } /* ** xFilter method implementation. */ static int fstreeFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ FstreeCsr *pCsr = (FstreeCsr*)pVtabCursor; FstreeVtab *pTab = (FstreeVtab*)(pCsr->base.pVtab); int rc; const char *zSql = "WITH r(d) AS (" " SELECT CASE WHEN dir='/' THEN '' ELSE dir END || '/' || name " " FROM fsdir WHERE dir=? AND name NOT LIKE '.%'" " UNION ALL" " SELECT dir || '/' || name FROM r, fsdir WHERE dir=d AND name NOT LIKE '.%'" ") SELECT d FROM r;"; const char *zDir = "/"; int nDir = 1; char aWild[2] = {'\0', '\0' }; fstreeCloseFd(pCsr); sqlite3_finalize(pCsr->pStmt); pCsr->pStmt = 0; rc = sqlite3_prepare_v2(pTab->db, zSql, -1, &pCsr->pStmt, 0); if( rc!=SQLITE_OK ) return rc; if( idxNum ){ const char *zQuery = (const char*)sqlite3_value_text(argv[0]); switch( idxNum ){ case SQLITE_INDEX_CONSTRAINT_GLOB: aWild[0] = '*'; aWild[1] = '?'; break; case SQLITE_INDEX_CONSTRAINT_LIKE: aWild[0] = '_'; aWild[1] = '%'; break; } if( zQuery[0]=='/' ){ int i; for(i=1; zQuery[i]; i++){ if( zQuery[i]==aWild[0] || zQuery[i]==aWild[1] ) break; if( zQuery[i]=='/' ) nDir = i; } zDir = zQuery; } } sqlite3_bind_text(pCsr->pStmt, 1, zDir, nDir, SQLITE_TRANSIENT); return fstreeNext(pVtabCursor); } /* ** xEof method implementation. */ static int fstreeEof(sqlite3_vtab_cursor *cur){ FstreeCsr *pCsr = (FstreeCsr*)cur; return pCsr->pStmt==0; } /* ** xColumn method implementation. */ static int fstreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ FstreeCsr *pCsr = (FstreeCsr*)cur; if( i==0 ){ /* path */ sqlite3_result_value(ctx, sqlite3_column_value(pCsr->pStmt, 0)); }else{ struct stat sBuf; fstat(pCsr->fd, &sBuf); if( S_ISREG(sBuf.st_mode) ){ if( i==1 ){ sqlite3_result_int64(ctx, sBuf.st_size); }else{ int nRead; char *aBuf = sqlite3_malloc(sBuf.st_mode+1); if( !aBuf ) return SQLITE_NOMEM; nRead = read(pCsr->fd, aBuf, sBuf.st_mode); if( nRead!=sBuf.st_mode ){ return SQLITE_IOERR; } sqlite3_result_blob(ctx, aBuf, nRead, SQLITE_TRANSIENT); sqlite3_free(aBuf); } } } return SQLITE_OK; } /* ** xRowid method implementation. */ static int fstreeRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){ *pRowid = 0; return SQLITE_OK; } /* ** End of fstree implementation. *************************************************************************/ /* ** This function is the implementation of both the xConnect and xCreate ** methods of the fs virtual table. ** ** The argv[] array contains the following: ** |
︙ | ︙ | |||
105 106 107 108 109 110 111 | 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; | | | 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 | 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 x(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){ |
︙ | ︙ | |||
184 185 186 187 188 189 190 | } return rc; } static int fsColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ fs_cursor *pCur = (fs_cursor*)cur; | | < > | 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 | } 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 || i==2 ); 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; int n; 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; |
︙ | ︙ | |||
280 281 282 283 284 285 286 287 288 289 290 291 292 293 | 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. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 | 0, /* xSync */ 0, /* xCommit */ 0, /* xRollback */ 0, /* xFindMethod */ 0, /* xRename */ }; static sqlite3_module fsdirModule = { 0, /* iVersion */ fsdirConnect, /* xCreate */ fsdirConnect, /* xConnect */ fsdirBestIndex, /* xBestIndex */ fsdirDisconnect, /* xDisconnect */ fsdirDisconnect, /* xDestroy */ fsdirOpen, /* xOpen - open a cursor */ fsdirClose, /* xClose - close a cursor */ fsdirFilter, /* xFilter - configure scan constraints */ fsdirNext, /* xNext - advance a cursor */ fsdirEof, /* xEof - check for end of scan */ fsdirColumn, /* xColumn - read data */ fsdirRowid, /* xRowid - read data */ 0, /* xUpdate */ 0, /* xBegin */ 0, /* xSync */ 0, /* xCommit */ 0, /* xRollback */ 0, /* xFindMethod */ 0, /* xRename */ }; static sqlite3_module fstreeModule = { 0, /* iVersion */ fstreeConnect, /* xCreate */ fstreeConnect, /* xConnect */ fstreeBestIndex, /* xBestIndex */ fstreeDisconnect, /* xDisconnect */ fstreeDisconnect, /* xDestroy */ fstreeOpen, /* xOpen - open a cursor */ fstreeClose, /* xClose - close a cursor */ fstreeFilter, /* xFilter - configure scan constraints */ fstreeNext, /* xNext - advance a cursor */ fstreeEof, /* xEof - check for end of scan */ fstreeColumn, /* xColumn - read data */ fstreeRowid, /* 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. |
︙ | ︙ | |||
302 303 304 305 306 307 308 309 310 311 312 313 314 315 | 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 | > > | 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 | 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); sqlite3_create_module(db, "fsdir", &fsdirModule, 0); sqlite3_create_module(db, "fstree", &fstreeModule, 0); #endif return TCL_OK; } #endif |
︙ | ︙ |
Changes to test/fts4content.test.
︙ | ︙ | |||
583 584 585 586 587 588 589 | 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); | | | | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 | 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 path, data 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 path, data 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'); |
︙ | ︙ |
Changes to test/vtabH.test.
︙ | ︙ | |||
88 89 90 91 92 93 94 | foreach ::tclvar_set_omit {0 1} { foreach {tn expr res cnt} { 1 {value GLOB 'aban*'} {x3 abandon x4 abandonint} 2 2 {value LIKE '%ac%'} {x1 aback x7 backbone x8 backarrow} 300 3 {value REGEXP '^......$'} {x5 babble x6 baboon x9 castle} 30000 } { | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | foreach ::tclvar_set_omit {0 1} { foreach {tn expr res cnt} { 1 {value GLOB 'aban*'} {x3 abandon x4 abandonint} 2 2 {value LIKE '%ac%'} {x1 aback x7 backbone x8 backarrow} 300 3 {value REGEXP '^......$'} {x5 babble x6 baboon x9 castle} 30000 } { db cache flush set ::gfunc 0 if {$::tclvar_set_omit} {set cnt 0} do_test 2.$tclvar_set_omit.$tn.1 { execsql "SELECT name, value FROM vars WHERE name MATCH 'x*' AND $expr" } $res do_test 2.$tclvar_set_omit.$tn.2 { set ::gfunc } $cnt } } #------------------------------------------------------------------------- # if {$::tcl_platform(platform)=="unix"} { reset_db register_fs_module db do_execsql_test 3.0 { SELECT name FROM fsdir WHERE dir = '.' AND name = 'test.db'; SELECT name FROM fsdir WHERE dir = '.' AND name = '.' } {test.db .} # Read the first 5 entries from the root directory. # set res [list] foreach p [lrange [exec ls -U /] 0 4] { lappend res "/$p" } do_execsql_test 3.1 { SELECT path FROM fstree LIMIT 5; } $res # Read all entries in the current directory. # proc contents {pattern} { set res [list] foreach f [glob -nocomplain $pattern] { lappend res $f if {[file isdir $f]} { set res [concat $res [contents "$f/*"]] } } set res } set pwd "[pwd]/*" set res [contents $pwd] do_execsql_test 3.2 { SELECT path FROM fstree WHERE path GLOB $pwd ORDER BY 1 } [lsort $res] # Add some sub-directories and files to the current directory. # do_test 3.3 { catch { file delete -force subdir } foreach {path sz} { subdir/x1.txt 143 subdir/x2.txt 153 } { set dir [file dirname $path] catch { file mkdir $dir } set fd [open $path w] puts -nonewline $fd [string repeat 1 $sz] close $fd } } {} set pwd [pwd] do_execsql_test 3.5 { SELECT path, size FROM fstree WHERE path GLOB $pwd || '/subdir/*' ORDER BY 1 } [list \ "$pwd/subdir/x1.txt" 143 \ "$pwd/subdir/x2.txt" 153 \ ] do_execsql_test 3.6 { SELECT path, size FROM fstree WHERE path LIKE $pwd || '/subdir/%' ORDER BY 1 } [list \ "$pwd/subdir/x1.txt" 143 \ "$pwd/subdir/x2.txt" 153 \ ] do_execsql_test 3.7 { SELECT sum(size) FROM fstree WHERE path LIKE $pwd || '/subdir/%' } 296 do_execsql_test 3.8 { SELECT size FROM fstree WHERE path = $pwd || '/subdir/x1.txt' } 143 } finish_test |