Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Improve test coverage of fts3.c. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
56b6432f8622d53ffd3a4d9a2244114f |
User & Date: | dan 2009-12-09 14:39:41.000 |
Context
2009-12-09
| ||
17:36 | The USING clause and NATURAL JOIN look at all tables to the left when searching for a match, not just the one table to the immediate left. Tables further to the left are preferred. Fix for ticket [f74beaabde]. Still need to add test cases to complete the ticket. (check-in: b558e96f0a user: drh tags: trunk) | |
14:39 | Improve test coverage of fts3.c. (check-in: 56b6432f86 user: dan tags: trunk) | |
05:30 | Mark fts3ReallocOrFree and fts3InitVtab as static. Ticket [ff44d82f3b]. (check-in: a9038306c3 user: dan tags: trunk) | |
Changes
Changes to ext/fts3/fts3.c.
︙ | ︙ | |||
377 378 379 380 381 382 383 | ** Read a 64-bit variable-length integer from memory starting at p[0]. ** Return the number of bytes read, or 0 on error. ** The value is stored in *v. */ int sqlite3Fts3GetVarint(const char *p, sqlite_int64 *v){ const unsigned char *q = (const unsigned char *) p; sqlite_uint64 x = 0, y = 1; | | < < < < < | 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 | ** Read a 64-bit variable-length integer from memory starting at p[0]. ** Return the number of bytes read, or 0 on error. ** The value is stored in *v. */ int sqlite3Fts3GetVarint(const char *p, sqlite_int64 *v){ const unsigned char *q = (const unsigned char *) p; sqlite_uint64 x = 0, y = 1; while( (*q&0x80)==0x80 && q-(unsigned char *)p<FTS3_VARINT_MAX ){ x += y * (*q++ & 0x7f); y <<= 7; } x += y * (*q++); *v = (sqlite_int64) x; return (int) (q - (unsigned char *)p); } /* ** Similar to sqlite3Fts3GetVarint(), except that the output is truncated to a ** 32-bit integer before it is returned. */ int sqlite3Fts3GetVarint32(const char *p, int *pi){ sqlite_int64 i; int ret = sqlite3Fts3GetVarint(p, &i); *pi = (int) i; return ret; } /* ** Return the number of bytes required to store the value passed as the ** first argument in varint form. */ |
︙ | ︙ | |||
429 430 431 432 433 434 435 | ** ** "abc" becomes abc ** 'xyz' becomes xyz ** [pqr] becomes pqr ** `mno` becomes mno */ void sqlite3Fts3Dequote(char *z){ | | | > > > | | < | > | 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 | ** ** "abc" becomes abc ** 'xyz' becomes xyz ** [pqr] becomes pqr ** `mno` becomes mno */ void sqlite3Fts3Dequote(char *z){ char quote; int i, j; quote = z[0]; switch( quote ){ case '\'': break; case '"': break; case '`': break; /* For MySQL compatibility */ case '[': quote = ']'; break; /* For MS SqlServer compatibility */ default: return; } i = 1; j = 0; while( ALWAYS(z[i]) ){ if( z[i]==quote ){ if( z[i+1]==quote ){ z[j++] = quote; i += 2; }else{ break; } }else{ z[j++] = z[i++]; } } z[j] = 0; } static void fts3GetDeltaVarint(char **pp, sqlite3_int64 *pVal){ sqlite3_int64 iVal; *pp += sqlite3Fts3GetVarint(*pp, &iVal); *pVal += iVal; } |
︙ | ︙ | |||
887 888 889 890 891 892 893 | static int fts3CursorSeek(Fts3Cursor *pCsr){ if( pCsr->isRequireSeek ){ pCsr->isRequireSeek = 0; sqlite3_bind_int64(pCsr->pStmt, 1, pCsr->iPrevId); if( SQLITE_ROW==sqlite3_step(pCsr->pStmt) ){ return SQLITE_OK; }else{ | < < | > > > > > | > | 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | static int fts3CursorSeek(Fts3Cursor *pCsr){ if( pCsr->isRequireSeek ){ pCsr->isRequireSeek = 0; sqlite3_bind_int64(pCsr->pStmt, 1, pCsr->iPrevId); if( SQLITE_ROW==sqlite3_step(pCsr->pStmt) ){ return SQLITE_OK; }else{ int rc = sqlite3_reset(pCsr->pStmt); if( rc==SQLITE_OK ){ /* If no row was found and no error has occured, then the %_content ** table is missing a row that is present in the full-text index. ** The data structures are corrupt. */ rc = SQLITE_CORRUPT; } pCsr->isEof = 1; return rc; } }else{ return SQLITE_OK; } } |
︙ | ︙ |
Changes to ext/fts3/fts3_write.c.
︙ | ︙ | |||
276 277 278 279 280 281 282 | if( rc!=SQLITE_OK ) return rc; sqlite3_reset(pStmt); if( pzBlock ){ sqlite3_bind_int64(pStmt, 1, iBlock); rc = sqlite3_step(pStmt); if( rc!=SQLITE_ROW ){ | | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | if( rc!=SQLITE_OK ) return rc; sqlite3_reset(pStmt); if( pzBlock ){ sqlite3_bind_int64(pStmt, 1, iBlock); rc = sqlite3_step(pStmt); if( rc!=SQLITE_ROW ){ return (rc==SQLITE_DONE ? SQLITE_CORRUPT : rc); } *pnBlock = sqlite3_column_bytes(pStmt, 0); *pzBlock = (char *)sqlite3_column_blob(pStmt, 0); if( !*pzBlock ){ return SQLITE_NOMEM; } |
︙ | ︙ |
Changes to test/e_fts3.test.
︙ | ︙ | |||
33 34 35 36 37 38 39 40 41 42 43 44 45 46 | proc read_test {tn sql result} { uplevel [list do_select_test e_fts3-$tn $sql $result] } proc error_test {tn sql result} { uplevel [list do_error_test e_fts3-$tn $sql $result] } #------------------------------------------------------------------------- # The body of the following [foreach] block contains test cases to verify # that the example code in fts3.html works as expected. The tests run three # times, with different values for DO_MALLOC_TEST. # # DO_MALLOC_TEST=0: Run tests with no OOM errors. # DO_MALLOC_TEST=1: Run tests with transient OOM errors. | > > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | proc read_test {tn sql result} { uplevel [list do_select_test e_fts3-$tn $sql $result] } proc error_test {tn sql result} { uplevel [list do_error_test e_fts3-$tn $sql $result] } if 1 { #------------------------------------------------------------------------- # The body of the following [foreach] block contains test cases to verify # that the example code in fts3.html works as expected. The tests run three # times, with different values for DO_MALLOC_TEST. # # DO_MALLOC_TEST=0: Run tests with no OOM errors. # DO_MALLOC_TEST=1: Run tests with transient OOM errors. |
︙ | ︙ | |||
582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | } {unable to use function MATCH in the requested context} error_test 7.3.3 { SELECT * FROM t7, t8 WHERE b MATCH 'letter' AND b MATCH 'd' } {unable to use function MATCH in the requested context} read_test 7.3.4 { SELECT * FROM t7, t8 WHERE a MATCH 'number' AND b MATCH 'letter' } {{number four} {letter D} {number four} {letter E} {number five} {letter D} {number five} {letter E}} #------------------------------------------------------------------------- # Test the quoting of FTS3 table column names. Names may be quoted using # any of "", '', ``` or []. # ddl_test 8.1.1 { CREATE VIRTUAL TABLE t9a USING fts3("c1", [c2]) } ddl_test 8.1.2 { CREATE VIRTUAL TABLE t9b USING fts3('c1', `c2`) } read_test 8.1.3 { PRAGMA table_info(t9a) } {0 c1 {} 0 {} 0 1 c2 {} 0 {} 0} read_test 8.1.4 { PRAGMA table_info(t9b) } {0 c1 {} 0 {} 0 1 c2 {} 0 {} 0} ddl_test 8.2.1 { CREATE VIRTUAL TABLE t9c USING fts3("c""1", 'c''2') } read_test 8.2.2 { PRAGMA table_info(t9c) } {0 c\"1 {} 0 {} 0 1 c'2 {} 0 {} 0} #------------------------------------------------------------------------- | > > > | 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 | } {unable to use function MATCH in the requested context} error_test 7.3.3 { SELECT * FROM t7, t8 WHERE b MATCH 'letter' AND b MATCH 'd' } {unable to use function MATCH in the requested context} read_test 7.3.4 { SELECT * FROM t7, t8 WHERE a MATCH 'number' AND b MATCH 'letter' } {{number four} {letter D} {number four} {letter E} {number five} {letter D} {number five} {letter E}} } #------------------------------------------------------------------------- # Test the quoting of FTS3 table column names. Names may be quoted using # any of "", '', ``` or []. # set DO_MALLOC_TEST 0 ddl_test 8.1.1 { CREATE VIRTUAL TABLE t9a USING fts3("c1", [c2]) } ddl_test 8.1.2 { CREATE VIRTUAL TABLE t9b USING fts3('c1', `c2`) } read_test 8.1.3 { PRAGMA table_info(t9a) } {0 c1 {} 0 {} 0 1 c2 {} 0 {} 0} read_test 8.1.4 { PRAGMA table_info(t9b) } {0 c1 {} 0 {} 0 1 c2 {} 0 {} 0} ddl_test 8.2.1 { CREATE VIRTUAL TABLE t9c USING fts3("c""1", 'c''2') } read_test 8.2.2 { PRAGMA table_info(t9c) } {0 c\"1 {} 0 {} 0 1 c'2 {} 0 {} 0} #------------------------------------------------------------------------- |
︙ | ︙ | |||
625 626 627 628 629 630 631 632 | read_test 9.1.7 { SELECT * FROM t11 WHERE t11 MATCH 'table*' } {{fts3 tables}} read_test 9.1.8 { SELECT * FROM t11 WHERE x MATCH 'rename*' } {{are renameable}} } | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 | read_test 9.1.7 { SELECT * FROM t11 WHERE t11 MATCH 'table*' } {{fts3 tables}} read_test 9.1.8 { SELECT * FROM t11 WHERE x MATCH 'rename*' } {{are renameable}} } #------------------------------------------------------------------------- #------------------------------------------------------------------------- # Test a couple of cases involving corrupt data structures: # # 1) A case where a document referenced by the full-text index is # not present in the %_content table. # # 2) A badly formatted b-tree segment node. # set DO_MALLOC_TEST 0 ddl_test 10.1.1 { CREATE VIRTUAL TABLE ta USING fts3 } write_test 10.1.2 ta_content { INSERT INTO ta VALUES('During a summer vacation in 1790') } write_test 10.1.3 ta_content { INSERT INTO ta VALUES('Wordsworth went on a walking tour') } write_test 10.1.4 ta_content { DELETE FROM ta_content WHERE rowid = 2 } read_test 10.1.5 { SELECT * FROM ta WHERE ta MATCH 'summer' } {{During a summer vacation in 1790}} error_test 10.1.6 { SELECT * FROM ta WHERE ta MATCH 'walking' } {database disk image is malformed} write_test 10.2.1 ta_content { DELETE FROM ta } write_test 10.2.2 ta_content { INSERT INTO ta VALUES('debate demonstrated the rising difficulty') } write_test 10.2.3 ta_content { INSERT INTO ta VALUES('Google released its browser beta') } set blob [db one {SELECT root FROM ta_segdir WHERE rowid = 2}] binary scan $blob "a6 a3 a*" start middle end set middle "\x0E\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x06\x06" set blob [binary format "a6 a* a*" $start $middle $end] write_test 10.2.4 ta_segdir { UPDATE ta_segdir SET root = $blob WHERE rowid = 2 } error_test 10.2.5 { SELECT * FROM ta WHERE ta MATCH 'beta' } {database disk image is malformed} finish_test |
Changes to test/fts3_common.tcl.
︙ | ︙ | |||
306 307 308 309 310 311 312 | # by parameter $result, or (b) TCL throws an "out of memory" error. # # If DO_MALLOC_TEST is defined and set to zero, then the SELECT statement # is executed just once. In this case the test case passes if the results # match the expected results passed via parameter $result. # proc do_select_test {name sql result} { | | | | | 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 | # by parameter $result, or (b) TCL throws an "out of memory" error. # # If DO_MALLOC_TEST is defined and set to zero, then the SELECT statement # is executed just once. In this case the test case passes if the results # match the expected results passed via parameter $result. # proc do_select_test {name sql result} { uplevel [list doPassiveTest $name $sql [list 0 $result]] } proc do_error_test {name sql error} { uplevel [list doPassiveTest $name $sql [list 1 $error]] } proc doPassiveTest {name sql catchres} { if {![info exists ::DO_MALLOC_TEST]} { set ::DO_MALLOC_TEST 1 } if {$::DO_MALLOC_TEST} { set answers [list {1 {out of memory}} $catchres] set modes [list 100000 transient 1 persistent] } else { set answers [list $catchres] set modes [list 0 nofail] } set str [join $answers " OR "] foreach {nRepeat zName} $modes { for {set iFail 1} 1 {incr iFail} { if {$::DO_MALLOC_TEST} {sqlite3_memdebug_fail $iFail -repeat $nRepeat} set res [uplevel [list catchsql $sql]] if {[lsearch -exact $answers $res]>=0} { set res $str } do_test $name.$zName.$iFail [list set {} $res] $str set nFail [sqlite3_memdebug_fail -1 -benigncnt nBenign] if {$nFail==0} break } |
︙ | ︙ |
Changes to test/fts3rnd.test.
︙ | ︙ | |||
144 145 146 147 148 149 150 | # db transaction { catchsql { DROP TABLE t1 } execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c, test:$nodesize)" for {set i 0} {$i < 100} {incr i} { insert_row $i } } | | > > > > > > > | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | # db transaction { catchsql { DROP TABLE t1 } execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c, test:$nodesize)" for {set i 0} {$i < 100} {incr i} { insert_row $i } } for {set iTest 0} {$iTest <= 100} {incr iTest} { set DO_MALLOC_TEST 0 set nRep 10 if {$iTest==100 && $nodesize==50} { set DO_MALLOC_TEST 1 set nRep 2 } # Delete one row, update one row and insert one row. # set rows [array names ::t1] set nRow [llength $rows] set iUpdate [lindex $rows [expr {int(rand()*$nRow)}]] set iDelete $iUpdate |
︙ | ︙ | |||
172 173 174 175 176 177 178 | # Pick 10 terms from the vocabulary. Check that the results of querying # the database for the set of documents containing each of these terms # is the same as the result obtained by scanning the contents of the Tcl # array for each term. # for {set i 0} {$i < 10} {incr i} { set term [random_term] | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | # Pick 10 terms from the vocabulary. Check that the results of querying # the database for the set of documents containing each of these terms # is the same as the result obtained by scanning the contents of the Tcl # array for each term. # for {set i 0} {$i < 10} {incr i} { set term [random_term] do_select_test fts3rnd-1.$nodesize.$iTest.1.$i { SELECT docid FROM t1 WHERE t1 MATCH $term } [simple_phrase $term] } # This time, use the first two characters of each term as a term prefix # to query for. Test that querying the Tcl array produces the same results # as querying the FTS3 table for the prefix. # for {set i 0} {$i < $nRep} {incr i} { set prefix [string range [random_term] 0 1] set match "${prefix}*" do_select_test fts3rnd-1.$nodesize.$iTest.2.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_phrase $match] } # Similar to the above, except for phrase queries. # for {set i 0} {$i < $nRep} {incr i} { set term [list [random_term] [random_term]] set match "\"$term\"" do_select_test fts3rnd-1.$nodesize.$iTest.3.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_phrase $term] } # Three word phrases. # for {set i 0} {$i < $nRep} {incr i} { set term [list [random_term] [random_term] [random_term]] set match "\"$term\"" do_select_test fts3rnd-1.$nodesize.$iTest.4.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_phrase $term] } # Three word phrases made up of term-prefixes. # for {set i 0} {$i < $nRep} {incr i} { set query "[string range [random_term] 0 1]* " append query "[string range [random_term] 0 1]* " append query "[string range [random_term] 0 1]*" set match "\"$query\"" do_select_test fts3rnd-1.$nodesize.$iTest.5.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_phrase $query] } # A NEAR query with terms as the arguments. # for {set i 0} {$i < $nRep} {incr i} { set terms [list [random_term] [random_term]] set match [join $terms " NEAR "] do_select_test fts3rnd-1.$nodesize.$iTest.6.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_near $terms 10] } # A 3-way NEAR query with terms as the arguments. # for {set i 0} {$i < $nRep} {incr i} { set terms [list [random_term] [random_term] [random_term]] set nNear 11 set match [join $terms " NEAR/$nNear "] set fts3 [execsql { SELECT docid FROM t1 WHERE t1 MATCH $match }] do_select_test fts3rnd-1.$nodesize.$iTest.7.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [simple_near $terms $nNear] } # Set operations on simple term queries. # foreach {tn op proc} { 8 OR setop_or 9 NOT setop_not 10 AND setop_and } { for {set i 0} {$i < $nRep} {incr i} { set term1 [random_term] set term2 [random_term] set match "$term1 $op $term2" do_select_test fts3rnd-1.$nodesize.$iTest.$tn.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [$proc [simple_phrase $term1] [simple_phrase $term2]] } } # Set operations on NEAR queries. # foreach {tn op proc} { 8 OR setop_or 9 NOT setop_not 10 AND setop_and } { for {set i 0} {$i < $nRep} {incr i} { set term1 [random_term] set term2 [random_term] set term3 [random_term] set term4 [random_term] set match "$term1 NEAR $term2 $op $term3 NEAR $term4" do_select_test fts3rnd-1.$nodesize.$iTest.$tn.$i { SELECT docid FROM t1 WHERE t1 MATCH $match } [$proc \ [simple_near [list $term1 $term2] 10] \ [simple_near [list $term3 $term4] 10] ] } } } } finish_test |