Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add support for the "colname : <nearset>" syntax to fts5. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | fts5 |
Files: | files | file ages | folders |
SHA1: |
004667106e552e832a564b77e242b86f |
User & Date: | dan 2014-07-05 07:54:01.680 |
Context
2014-07-05
| ||
15:15 | Add support for AND, OR and NOT to fts5. (check-in: 8682b87e79 user: dan tags: fts5) | |
07:54 | Add support for the "colname : <nearset>" syntax to fts5. (check-in: 004667106e user: dan tags: fts5) | |
2014-07-03
| ||
20:39 | Add support for NEAR expressions to fts5. (check-in: 250ae8d401 user: dan tags: fts5) | |
Changes
Changes to ext/fts5/fts5_expr.c.
︙ | ︙ | |||
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | Fts5ExprNode *pExpr; /* Result of a successful parse */ }; /************************************************************************* */ typedef struct Fts5PoslistIter Fts5PoslistIter; struct Fts5PoslistIter { const u8 *a; /* Position list to iterate through */ int n; /* Size of buffer at a[] in bytes */ int i; /* Current offset in a[] */ /* Output variables */ int bEof; /* Set to true at EOF */ i64 iPos; /* (iCol<<32) + iPos */ }; static int fts5PoslistIterNext(Fts5PoslistIter *pIter){ if( pIter->i>=pIter->n ){ pIter->bEof = 1; }else{ int iVal; pIter->i += getVarint32(&pIter->a[pIter->i], iVal); if( iVal==1 ){ pIter->i += getVarint32(&pIter->a[pIter->i], iVal); | > > > > | | > | > > > > > > | > > | 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 | Fts5ExprNode *pExpr; /* Result of a successful parse */ }; /************************************************************************* */ typedef struct Fts5PoslistIter Fts5PoslistIter; struct Fts5PoslistIter { int iCol; /* If (iCol>=0), this column only */ const u8 *a; /* Position list to iterate through */ int n; /* Size of buffer at a[] in bytes */ int i; /* Current offset in a[] */ /* Output variables */ int bEof; /* Set to true at EOF */ i64 iPos; /* (iCol<<32) + iPos */ }; static int fts5PoslistIterNext(Fts5PoslistIter *pIter){ if( pIter->i>=pIter->n ){ pIter->bEof = 1; }else{ int iVal; pIter->i += getVarint32(&pIter->a[pIter->i], iVal); if( iVal==1 ){ pIter->i += getVarint32(&pIter->a[pIter->i], iVal); if( pIter->iCol>=0 && iVal>pIter->iCol ){ pIter->bEof = 1; }else{ pIter->iPos = ((u64)iVal << 32); pIter->i += getVarint32(&pIter->a[pIter->i], iVal); } } pIter->iPos += (iVal-2); } return pIter->bEof; } static int fts5PoslistIterInit( int iCol, /* If (iCol>=0), this column only */ const u8 *a, int n, /* Poslist buffer to iterate through */ Fts5PoslistIter *pIter /* Iterator object to initialize */ ){ memset(pIter, 0, sizeof(*pIter)); pIter->a = a; pIter->n = n; pIter->iCol = iCol; do { fts5PoslistIterNext(pIter); }while( pIter->bEof==0 && (pIter->iPos >> 32)<iCol ); return pIter->bEof; } typedef struct Fts5PoslistWriter Fts5PoslistWriter; struct Fts5PoslistWriter { int iCol; int iOff; }; |
︙ | ︙ | |||
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 | ** ** SQLITE_OK is returned if an error occurs, or an SQLite error code ** otherwise. It is not considered an error code if the current rowid is ** not a match. */ static int fts5ExprPhraseIsMatch( Fts5Expr *pExpr, /* Expression pPhrase belongs to */ Fts5ExprPhrase *pPhrase, /* Phrase object to initialize */ int *pbMatch /* OUT: Set to true if really a match */ ){ Fts5PoslistWriter writer = {0, 0}; Fts5PoslistIter aStatic[4]; Fts5PoslistIter *aIter = aStatic; int i; int rc = SQLITE_OK; /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ if( pPhrase->nTerm>(sizeof(aStatic) / sizeof(aStatic[0])) ){ int nByte = sizeof(Fts5PoslistIter) * pPhrase->nTerm; aIter = (Fts5PoslistIter*)sqlite3_malloc(nByte); if( !aIter ) return SQLITE_NOMEM; } /* Initialize a term iterator for each term in the phrase */ for(i=0; i<pPhrase->nTerm; i++){ int n; const u8 *a = sqlite3Fts5IterPoslist(pPhrase->aTerm[i].pIter, &n); | > > > | < | 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 | ** ** SQLITE_OK is returned if an error occurs, or an SQLite error code ** otherwise. It is not considered an error code if the current rowid is ** not a match. */ static int fts5ExprPhraseIsMatch( Fts5Expr *pExpr, /* Expression pPhrase belongs to */ int iCol, /* If >=0, search for matches in iCol only */ Fts5ExprPhrase *pPhrase, /* Phrase object to initialize */ int *pbMatch /* OUT: Set to true if really a match */ ){ Fts5PoslistWriter writer = {0, 0}; Fts5PoslistIter aStatic[4]; Fts5PoslistIter *aIter = aStatic; int i; int rc = SQLITE_OK; fts5BufferZero(&pPhrase->poslist); /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ if( pPhrase->nTerm>(sizeof(aStatic) / sizeof(aStatic[0])) ){ int nByte = sizeof(Fts5PoslistIter) * pPhrase->nTerm; aIter = (Fts5PoslistIter*)sqlite3_malloc(nByte); if( !aIter ) return SQLITE_NOMEM; } /* Initialize a term iterator for each term in the phrase */ for(i=0; i<pPhrase->nTerm; i++){ int n; const u8 *a = sqlite3Fts5IterPoslist(pPhrase->aTerm[i].pIter, &n); if( fts5PoslistIterInit(iCol, a, n, &aIter[i]) ) goto ismatch_out; } while( 1 ){ int bMatch; i64 iPos = aIter[0].iPos; do { bMatch = 1; for(i=0; i<pPhrase->nTerm; i++){ Fts5PoslistIter *pPos = &aIter[i]; |
︙ | ︙ | |||
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 | ismatch_out: *pbMatch = (pPhrase->poslist.n>0); if( aIter!=aStatic ) sqlite3_free(aIter); return rc; } static int fts5ExprNearIsMatch(Fts5ExprNearset *pNear, int *pbMatch){ Fts5PoslistIter aStatic[4]; Fts5PoslistIter *aIter = aStatic; int i; int rc = SQLITE_OK; int bMatch; i64 iMax; /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ if( pNear->nPhrase>(sizeof(aStatic) / sizeof(aStatic[0])) ){ int nByte = sizeof(Fts5PoslistIter) * pNear->nPhrase; aIter = (Fts5PoslistIter*)sqlite3_malloc(nByte); if( !aIter ) return SQLITE_NOMEM; } /* Initialize a term iterator for each phrase */ for(i=0; i<pNear->nPhrase; i++){ Fts5Buffer *pPoslist = &pNear->apPhrase[i]->poslist; | > > > > > > > > > > > > > > > > > > | | 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 | ismatch_out: *pbMatch = (pPhrase->poslist.n>0); if( aIter!=aStatic ) sqlite3_free(aIter); return rc; } /* ** The near-set object passed as the first argument contains more than ** one phrase. All phrases currently point to the same row. The ** Fts5ExprPhrase.poslist buffers are populated accordingly. This function ** tests if the current row contains instances of each phrase sufficiently ** close together to meet the NEAR constraint. Output variable *pbMatch ** is set to true if it does, or false otherwise. ** ** If no error occurs, SQLITE_OK is returned. Or, if an error does occur, ** an SQLite error code. If a value other than SQLITE_OK is returned, the ** final value of *pbMatch is undefined. ** ** TODO: This function should also edit the position lists associated ** with each phrase to remove any phrase instances that are not part of ** a set of intances that collectively matches the NEAR constraint. */ static int fts5ExprNearIsMatch(Fts5ExprNearset *pNear, int *pbMatch){ Fts5PoslistIter aStatic[4]; Fts5PoslistIter *aIter = aStatic; int i; int rc = SQLITE_OK; int bMatch; i64 iMax; assert( pNear->nPhrase>1 ); /* If the aStatic[] array is not large enough, allocate a large array ** using sqlite3_malloc(). This approach could be improved upon. */ if( pNear->nPhrase>(sizeof(aStatic) / sizeof(aStatic[0])) ){ int nByte = sizeof(Fts5PoslistIter) * pNear->nPhrase; aIter = (Fts5PoslistIter*)sqlite3_malloc(nByte); if( !aIter ) return SQLITE_NOMEM; } /* Initialize a term iterator for each phrase */ for(i=0; i<pNear->nPhrase; i++){ Fts5Buffer *pPoslist = &pNear->apPhrase[i]->poslist; fts5PoslistIterInit(-1, pPoslist->p, pPoslist->n, &aIter[i]); } iMax = aIter[0].iPos; do { bMatch = 1; for(i=0; i<pNear->nPhrase; i++){ Fts5PoslistIter *pPos = &aIter[i]; |
︙ | ︙ | |||
553 554 555 556 557 558 559 | /* Advance the iterators until they are a match */ rc = fts5ExprNearNextRowidMatch(pExpr, pNode); if( pNode->bEof || rc!=SQLITE_OK ) break; for(i=0; i<pNear->nPhrase; i++){ Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; | | | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | /* Advance the iterators until they are a match */ rc = fts5ExprNearNextRowidMatch(pExpr, pNode); if( pNode->bEof || rc!=SQLITE_OK ) break; for(i=0; i<pNear->nPhrase; i++){ Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; if( pPhrase->nTerm>1 || pNear->iCol>=0 ){ int bMatch = 0; rc = fts5ExprPhraseIsMatch(pExpr, pNear->iCol, pPhrase, &bMatch); if( rc!=SQLITE_OK ) return rc; if( bMatch==0 ) break; }else{ int n; const u8 *a = sqlite3Fts5IterPoslist(pPhrase->aTerm[0].pIter, &n); fts5BufferSet(&rc, &pPhrase->poslist, n, a); } } if( i==pNear->nPhrase ){ int bMatch = 1; if( pNear->nPhrase>1 ){ |
︙ | ︙ | |||
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 | char *zNew2 = sqlite3_mprintf("%s%s", zApp, zNew); sqlite3_free(zNew); zNew = zNew2; } sqlite3_free(zApp); return zNew; } static char *fts5ExprPrint(Fts5Config *pConfig, Fts5ExprNode *pExpr){ char *zRet = 0; if( pExpr->eType==FTS5_STRING ){ Fts5ExprNearset *pNear = pExpr->pNear; int i; int iTerm; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 | char *zNew2 = sqlite3_mprintf("%s%s", zApp, zNew); sqlite3_free(zNew); zNew = zNew2; } sqlite3_free(zApp); return zNew; } /* ** Compose a tcl-readable representation of expression pExpr. Return a ** pointer to a buffer containing that representation. It is the ** responsibility of the caller to at some point free the buffer using ** sqlite3_free(). */ static char *fts5ExprPrintTcl( Fts5Config *pConfig, const char *zNearsetCmd, Fts5ExprNode *pExpr ){ char *zRet = 0; if( pExpr->eType==FTS5_STRING ){ Fts5ExprNearset *pNear = pExpr->pNear; int i; int iTerm; zRet = fts5PrintfAppend(zRet, "[%s ", zNearsetCmd); if( pNear->iCol>=0 ){ zRet = fts5PrintfAppend(zRet, "-col %d ", pNear->iCol); if( zRet==0 ) return 0; } if( pNear->nPhrase>1 ){ zRet = fts5PrintfAppend(zRet, "-near %d ", pNear->nNear); if( zRet==0 ) return 0; } zRet = fts5PrintfAppend(zRet, "--"); if( zRet==0 ) return 0; for(i=0; i<pNear->nPhrase; i++){ Fts5ExprPhrase *pPhrase = pNear->apPhrase[i]; zRet = fts5PrintfAppend(zRet, " {"); for(iTerm=0; zRet && iTerm<pPhrase->nTerm; iTerm++){ char *zTerm = pPhrase->aTerm[iTerm].zTerm; zRet = fts5PrintfAppend(zRet, "%s%s", iTerm==0?"":" ", zTerm); } if( zRet ) zRet = fts5PrintfAppend(zRet, "}"); if( zRet==0 ) return 0; } if( zRet ) zRet = fts5PrintfAppend(zRet, "]"); if( zRet==0 ) return 0; }else{ char *zOp = 0; char *z1 = 0; char *z2 = 0; switch( pExpr->eType ){ case FTS5_AND: zOp = "&&"; break; case FTS5_NOT: zOp = "&& !"; break; case FTS5_OR: zOp = "||"; break; default: assert( 0 ); } z1 = fts5ExprPrintTcl(pConfig, zNearsetCmd, pExpr->pLeft); z2 = fts5ExprPrintTcl(pConfig, zNearsetCmd, pExpr->pRight); if( z1 && z2 ){ int b1 = pExpr->pLeft->eType!=FTS5_STRING; int b2 = pExpr->pRight->eType!=FTS5_STRING; zRet = sqlite3_mprintf("%s%s%s %s %s%s%s", b1 ? "(" : "", z1, b1 ? ")" : "", zOp, b2 ? "(" : "", z2, b2 ? ")" : "" ); } sqlite3_free(z1); sqlite3_free(z2); } return zRet; } static char *fts5ExprPrint(Fts5Config *pConfig, Fts5ExprNode *pExpr){ char *zRet = 0; if( pExpr->eType==FTS5_STRING ){ Fts5ExprNearset *pNear = pExpr->pNear; int i; int iTerm; |
︙ | ︙ | |||
1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 | ){ sqlite3 *db = sqlite3_context_db_handle(pCtx); const char *zExpr = 0; char *zErr = 0; Fts5Expr *pExpr = 0; int rc; int i; const char **azConfig; /* Array of arguments for Fts5Config */ int nConfig; /* Size of azConfig[] */ Fts5Config *pConfig = 0; | > > > > > > | | | > > > > | > | 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 | ){ sqlite3 *db = sqlite3_context_db_handle(pCtx); const char *zExpr = 0; char *zErr = 0; Fts5Expr *pExpr = 0; int rc; int i; int bTcl = sqlite3_user_data(pCtx)!=0; const char **azConfig; /* Array of arguments for Fts5Config */ const char *zNearsetCmd = "nearset"; int nConfig; /* Size of azConfig[] */ Fts5Config *pConfig = 0; if( bTcl && nArg>1 ){ zNearsetCmd = (const char*)sqlite3_value_text(apVal[1]); } nConfig = nArg + 2 - bTcl; azConfig = (const char**)sqlite3_malloc(sizeof(char*) * nConfig); if( azConfig==0 ){ sqlite3_result_error_nomem(pCtx); return; } azConfig[0] = 0; azConfig[1] = "main"; azConfig[2] = "tbl"; for(i=1+bTcl; i<nArg; i++){ azConfig[i+2-bTcl] = (const char*)sqlite3_value_text(apVal[i]); } zExpr = (const char*)sqlite3_value_text(apVal[0]); rc = sqlite3Fts5ConfigParse(db, nConfig, azConfig, &pConfig, &zErr); if( rc==SQLITE_OK ){ rc = sqlite3Fts5ExprNew(pConfig, zExpr, &pExpr, &zErr); } if( rc==SQLITE_OK ){ char *zText; if( bTcl ){ zText = fts5ExprPrintTcl(pConfig, zNearsetCmd, pExpr->pRoot); }else{ zText = fts5ExprPrint(pConfig, pExpr->pRoot); } if( rc==SQLITE_OK ){ sqlite3_result_text(pCtx, zText, -1, SQLITE_TRANSIENT); sqlite3_free(zText); } } if( rc!=SQLITE_OK ){ |
︙ | ︙ | |||
1162 1163 1164 1165 1166 1167 1168 | } /* ** This is called during initialization to register the fts5_expr() scalar ** UDF with the SQLite handle passed as the only argument. */ int sqlite3Fts5ExprInit(sqlite3 *db){ | > > > > > > > > > | | > > > > | | 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 | } /* ** This is called during initialization to register the fts5_expr() scalar ** UDF with the SQLite handle passed as the only argument. */ int sqlite3Fts5ExprInit(sqlite3 *db){ struct Fts5ExprFunc { const char *z; void *p; void (*x)(sqlite3_context*,int,sqlite3_value**); } aFunc[] = { { "fts5_expr", 0, fts5ExprFunction }, { "fts5_expr_tcl", (void*)1, fts5ExprFunction }, }; int i; int rc = SQLITE_OK; for(i=0; rc==SQLITE_OK && i<(sizeof(aFunc) / sizeof(aFunc[0])); i++){ struct Fts5ExprFunc *p = &aFunc[i]; rc = sqlite3_create_function(db, p->z, -1, SQLITE_UTF8, p->p, p->x, 0, 0); } return rc; } |
Changes to test/fts5ac.test.
︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | } do_test 1.1 { foreach {id x y} $data { execsql { INSERT INTO xx(rowid, x, y) VALUES($id, $x, $y) } } } {} foreach {tn phrase} { 1 "o" 2 "b q" 3 "e a e" 4 "m d g q q b k b w f q q p p" 5 "l o o l v v k" 6 "a" 7 "b" 8 "c" 9 "no" 10 "L O O L V V K" } { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | > | > > > > > > > > > > | > > > > | | > > > > > > > > > > > > > > > | > | | | 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 | } do_test 1.1 { foreach {id x y} $data { execsql { INSERT INTO xx(rowid, x, y) VALUES($id, $x, $y) } } } {} proc phrasematch {phrase value} { if {[string first $phrase $value]>=0} { return 1 } return 0 } # Usage: # proc nearmatch {nNear phraselist value} { set nPhrase [llength $phraselist] set phraselist [string tolower $phraselist] set value [string tolower $value] if {$nPhrase==1} { set bMatch [phrasematch [lindex $phraselist 0] $value] } else { set nValue [llength $value] if {$nNear >= $nValue} {set nNear [expr $nValue-1]} for {set i $nNear} {$i < $nValue} {incr i} { set bMatch 1 foreach phrase $phraselist { set iMin [expr $i - $nNear - [llength $phrase]] set iMax [expr $i - 1 + [llength $phrase]] set subdoc [lrange $value $iMin $iMax] if {![phrasematch $phrase $subdoc]} { set bMatch 0 break } } if {$bMatch} break } } return $bMatch } # Usage: # # nearset aCol ?-near N? ?-col C? -- phrase1 phrase2... # proc nearset {aCol args} { set O(-near) 10 set O(-col) -1 set nOpt [lsearch -exact $args --] if {$nOpt<0} { error "no -- option" } foreach {k v} [lrange $args 0 [expr $nOpt-1]] { if {[info exists O($k)]==0} { error "unrecognized option $k" } set O($k) $v } set phraselist [lrange $args [expr $nOpt+1] end] set bMatch 0 set iCol -1 foreach col $aCol { incr iCol if {$O(-col)>=0 && $O(-col)!=$iCol} continue if {[nearmatch $O(-near) $phraselist $col]} { set bMatch 1 break } } return $bMatch } proc matchdata {expr} { set tclexpr [db one {SELECT fts5_expr_tcl($expr, 'nearset $cols', 'x', 'y')}] set res [list] foreach {id x y} $::data { set cols [list $x $y] if $tclexpr { set res [concat $id $res] } } return $res } foreach {tn phrase} { 1 "o" 2 "b q" 3 "e a e" 4 "m d g q q b k b w f q q p p" 5 "l o o l v v k" 6 "a" 7 "b" 8 "c" 9 "no" 10 "L O O L V V K" } { set expr "\"$phrase\"" set res [matchdata $expr] do_execsql_test 1.2.$tn.[llength $res] { SELECT rowid FROM xx WHERE xx match $expr } $res } # Test the "nearmatch" commnad. # do_test 2.0 { nearmatch 2 {a b} {a x x b} } 1 do_test 2.1 { nearmatch 2 {b a} {a x x b} } 1 do_test 2.2 { nearmatch 1 {b a} {a x x b} } 0 do_test 2.3 { nearmatch 1 {"a b" "c d"} {x x a b x c d} } 1 do_test 2.4 { nearmatch 1 {"a b" "c d"} {x a b x x c d} } 0 do_test 2.5 { nearmatch 400 {a b} {a x x b} } 1 do_test 2.6 { nearmatch 0 {a} {a x x b} } 1 do_test 2.7 { nearmatch 0 {b} {a x x b} } 1 foreach {tn expr tclexpr} { 1 {a b} {[N $x -- {a}] && [N $x -- {b}]} } { do_execsql_test 3.$tn {SELECT fts5_expr_tcl($expr, 'N $x')} [list $tclexpr] } #------------------------------------------------------------------------- # foreach {tn expr} { 1 { NEAR(r c) } 2 { NEAR(r c, 5) } 3 { NEAR(r c, 3) } 4 { NEAR(r c, 2) } 5 { NEAR(r c, 0) } 6 { NEAR(a b c) } 7 { NEAR(a b c, 8) } 8 { x : NEAR(r c) } 9 { y : NEAR(r c) } 10 { x : "r c" } 11 { y : "r c" } } { set res [matchdata $expr] do_execsql_test 2.$tn.[llength $res] { SELECT rowid FROM xx WHERE xx match $expr } $res } finish_test |