Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add pseudo-random tests of the fts3 expression parser. Revise the fix in (6091). (CVS 6092) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
11c2d4686197fb3f0d601651d5bbb349 |
User & Date: | danielk1977 2009-01-01 07:08:55.000 |
Context
2009-01-01
| ||
07:42 | Add a couple of extra tests for the fts3 expression parser to improve mcdc coverage. (CVS 6093) (check-in: 13146b3493 user: danielk1977 tags: trunk) | |
07:08 | Add pseudo-random tests of the fts3 expression parser. Revise the fix in (6091). (CVS 6092) (check-in: 11c2d46861 user: danielk1977 tags: trunk) | |
04:19 | Fix a bug parsing "<expr> AND (abc NEAR def)" in fts3_expr.c. (CVS 6091) (check-in: d1a6a2edd7 user: danielk1977 tags: trunk) | |
Changes
Changes to ext/fts3/fts3_expr.c.
︙ | ︙ | |||
528 529 530 531 532 533 534 535 536 537 538 539 540 541 | pNot->pRight = pNotBranch; } pNotBranch = pNot; }else{ int eType = p->eType; assert( eType!=FTSQUERY_PHRASE || !p->pPhrase->isNot ); isPhrase = (eType==FTSQUERY_PHRASE || p->pLeft); if( !isPhrase && isRequirePhrase ){ sqlite3Fts3ExprFree(p); rc = SQLITE_ERROR; goto exprparse_out; } if( isPhrase && !isRequirePhrase ){ | > > > > > > | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | pNot->pRight = pNotBranch; } pNotBranch = pNot; }else{ int eType = p->eType; assert( eType!=FTSQUERY_PHRASE || !p->pPhrase->isNot ); isPhrase = (eType==FTSQUERY_PHRASE || p->pLeft); /* The isRequirePhrase variable is set to true if a phrase or ** an expression contained in parenthesis is required. If a ** binary operator (AND, OR, NOT or NEAR) is encounted when ** isRequirePhrase is set, this is a syntax error. */ if( !isPhrase && isRequirePhrase ){ sqlite3Fts3ExprFree(p); rc = SQLITE_ERROR; goto exprparse_out; } if( isPhrase && !isRequirePhrase ){ |
︙ | ︙ | |||
550 551 552 553 554 555 556 557 | } memset(pAnd, 0, sizeof(Fts3Expr)); pAnd->eType = FTSQUERY_AND; insertBinaryOperator(&pRet, pPrev, pAnd); pPrev = pAnd; } if( pPrev && ( | > > > > > > > > > | | < < < < | 556 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 | } memset(pAnd, 0, sizeof(Fts3Expr)); pAnd->eType = FTSQUERY_AND; insertBinaryOperator(&pRet, pPrev, pAnd); pPrev = pAnd; } /* This test catches attempts to make either operand of a NEAR ** operator something other than a phrase. For example, either of ** the following: ** ** (bracketed expression) NEAR phrase ** phrase NEAR (bracketed expression) ** ** Return an error in either case. */ if( pPrev && ( (eType==FTSQUERY_NEAR && !isPhrase && pPrev->eType!=FTSQUERY_PHRASE) || (eType!=FTSQUERY_PHRASE && isPhrase && pPrev->eType==FTSQUERY_NEAR) )){ sqlite3Fts3ExprFree(p); rc = SQLITE_ERROR; goto exprparse_out; } if( isPhrase ){ if( pRet ){ |
︙ | ︙ |
Changes to test/fts3expr.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2006 September 9 # # 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 FTS3 module. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2006 September 9 # # 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 FTS3 module. # # $Id: fts3expr.test,v 1.3 2009/01/01 07:08:55 danielk1977 Exp $ # set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_ENABLE_FTS3 is defined, omit this file. ifcapable !fts3 { |
︙ | ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 | do_test fts3expr-3.4 { test_fts3expr2 "(((ab OR cd)))" } {OR ab cd} do_test fts3expr-3.5 { test_fts3expr2 "one AND (two NEAR three)" } {AND one {NEAR/10 two three}} #------------------------------------------------------------------------ # The following tests, fts3expr-4.*, test the parsers response to syntax # errors in query expressions. This is done using a real fts3 table and # MATCH clauses, not the parser test interface. # do_test fts3expr-4.1 { | > > > > > > > > > > > > > > > > > > > > > > | 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 | do_test fts3expr-3.4 { test_fts3expr2 "(((ab OR cd)))" } {OR ab cd} do_test fts3expr-3.5 { test_fts3expr2 "one AND (two NEAR three)" } {AND one {NEAR/10 two three}} do_test fts3expr-3.6 { test_fts3expr2 "one (two NEAR three)" } {AND one {NEAR/10 two three}} do_test fts3expr-3.7 { test_fts3expr2 "(two NEAR three) one" } {AND {NEAR/10 two three} one} do_test fts3expr-3.8 { test_fts3expr2 "(two NEAR three) AND one" } {AND {NEAR/10 two three} one} do_test fts3expr-3.9 { test_fts3expr2 "(two NEAR three) (four five)" } {AND {NEAR/10 two three} {AND four five}} do_test fts3expr-3.10 { test_fts3expr2 "(two NEAR three) AND (four five)" } {AND {NEAR/10 two three} {AND four five}} do_test fts3expr-3.11 { test_fts3expr2 "(two NEAR three) (four NEAR five)" } {AND {NEAR/10 two three} {NEAR/10 four five}} do_test fts3expr-3.12 { test_fts3expr2 "(two NEAR three) OR (four NEAR five)" } {OR {NEAR/10 two three} {NEAR/10 four five}} #------------------------------------------------------------------------ # The following tests, fts3expr-4.*, test the parsers response to syntax # errors in query expressions. This is done using a real fts3 table and # MATCH clauses, not the parser test interface. # do_test fts3expr-4.1 { |
︙ | ︙ |
Added test/fts3expr2.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 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 | # 2009 January 1 # # 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 FTS3 module syntax parser. # # $Id: fts3expr2.test,v 1.1 2009/01/01 07:08:55 danielk1977 Exp $ # set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_ENABLE_FTS3 is defined, omit this file. ifcapable !fts3 { finish_test return } # Test overview: # # The tests in this file are pseudo-randomly generated. They test # the fts3 match expression parser via the test interface # SQL function "fts3_exprtest" (see comments in fts3_expr.c). # # Each test case works as follows: # # 1. A random expression tree is generated using proc [random_expr_tree]. # 2. The expression tree is converted to the text of an equivalent # fts3 expression using proc [tree_to_expr]. # 3. The test SQL function "fts3_exprtest" is used to parse the # expression text generated in step (2), returning a parsed expression # tree. # 4. Test that the tree returned in step (3) matches that generated in # step (1). # # In step (2), 4 different fts3 expressions are created from each # expression tree by varying the following boolean properties: # # * Whether or not superflous parenthesis are included. i.e. if # "a OR b AND (c OR d)" or "a OR (b AND (c OR d))" is generated. # # * Whether or not explict AND operators are used. i.e. if # "a OR b AND c" or "a OR b c" is generated. # set sqlite_fts3_enable_parentheses 1 proc strip_phrase_data {L} { if {[lindex $L 0] eq "PHRASE"} { return [list P [lrange $L 3 end]] } return [list \ [lindex $L 0] \ [strip_phrase_data [lindex $L 1]] \ [strip_phrase_data [lindex $L 2]] \ ] } proc test_fts3expr2 {expr} { strip_phrase_data [ db one {SELECT fts3_exprtest('simple', $expr, 'a', 'b', 'c')} ] } proc rnd {nMax} { expr {int(rand()*$nMax)} } proc random_phrase {} { set phrases [list one two three four "one two" "three four"] list P [lindex $phrases [rnd [llength $phrases]]] } # Generate and return a pseudo-random expression tree. Using the same # format returned by the [test_fts3expr2] proc. # proc random_expr_tree {iHeight} { if {$iHeight==0 || [rnd 3]==0} { return [random_phrase] } set operators [list NEAR NOT AND OR] set op [lindex $operators [rnd 4]] if {$op eq "NEAR"} { set iDistance [rnd 15] return [list $op/$iDistance [random_phrase] [random_phrase]] } set iNH [expr {$iHeight - 1}] return [list $op [random_expr_tree $iNH] [random_expr_tree $iNH]] } # Given an expression tree, generate a corresponding expression. # proc tree_to_expr {tree all_brackets implicit_and} { set prec(NOT) 2 set prec(AND) 3 set prec() 3 set prec(OR) 4 set op [lindex $tree 0] if {$op eq "P"} { set phrase [lindex $tree 1] if {[llength $phrase]>1} { return "\"$phrase\"" } else { return $phrase } } if {$op eq "NEAR/10"} { set op "NEAR" } if {$op eq "AND" && $implicit_and} { set op "" } set lhs [lindex $tree 1] set rhs [lindex $tree 2] set zLeft [tree_to_expr $lhs $all_brackets $implicit_and] set zRight [tree_to_expr $rhs $all_brackets $implicit_and] set iPrec 5 set iLeftPrec 0 set iRightPrec 0 catch {set iPrec $prec($op)} catch {set iLeftPrec $prec([lindex $lhs 0])} catch {set iRightPrec $prec([lindex $rhs 0])} if {$iLeftPrec > $iPrec || $all_brackets} { set zLeft "($zLeft)" } if {$iRightPrec >= $iPrec || $all_brackets} { set zRight "($zRight)" } return "$zLeft $op $zRight" } proc do_exprparse_test {name expr tree} { uplevel do_test $name [list "test_fts3expr2 {$expr}"] [list $tree] } for {set iTest 1} {$iTest<500} {incr iTest} { set t [random_expr_tree 4] set e1 [tree_to_expr $t 0 0] set e2 [tree_to_expr $t 0 1] set e3 [tree_to_expr $t 1 0] set e4 [tree_to_expr $t 1 1] do_exprparse_test fts3expr2-$iTest.1 $e1 $t do_exprparse_test fts3expr2-$iTest.2 $e2 $t do_exprparse_test fts3expr2-$iTest.3 $e3 $t do_exprparse_test fts3expr2-$iTest.4 $e4 $t } set sqlite_fts3_enable_parentheses 0 finish_test |