Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Avoid using keyword "near" as a variable name in fts5.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
278cfaeb70d8ee6b61c150935ec85812 |
| User & Date: | dan 2013-01-13 05:30:38 |
Context
|
2013-01-14
| ||
| 17:05 | Fix problems with the matchinfo functions used by the bm25(f) implementation. check-in: 739cd82fca user: dan tags: trunk | |
|
2013-01-13
| ||
| 05:30 | Avoid using keyword "near" as a variable name in fts5.c. check-in: 278cfaeb70 user: dan tags: trunk | |
|
2013-01-12
| ||
| 15:50 | Many fts5 related fixes. check-in: e21b7b67b5 user: dan tags: trunk | |
Changes
Changes to src/fts5.c.
2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 |
if( pNext->nList==0 ){
pTrim->nList = 0;
}else{
int bEof = 0;
int nTrail = nNear + (pNext->nToken-1) + 1;
int nLead = nNear + (pTrim->nToken-1) + 1;
InstanceList near;
InstanceList in;
InstanceList out;
fts5InstanceListInit(pNext->aList, pNext->nList, &near);
fts5InstanceListInit(pTrim->aList, pTrim->nList, &in);
fts5InstanceListInit(pTrim->aList, pTrim->nList, &out);
fts5InstanceListNext(&near);
fts5InstanceListNext(&in);
while( bEof==0 ){
if( fts5IsNear(&near, &in, nTrail)
|| fts5IsNear(&in, &near, nLead)
){
/* The current position is a match. Append an entry to the output
** and advance the input cursor. */
fts5InstanceListAppend(&out, in.iCol, in.iStream, in.iOff);
bEof = fts5InstanceListNext(&in);
}else{
if( near.iCol<in.iCol || (near.iCol==in.iCol && near.iOff<in.iOff) ){
bEof = fts5InstanceListNext(&near);
}else if( near.iCol==in.iCol && near.iOff==in.iOff ){
bEof = fts5InstanceListNext(&in);
if( fts5IsNear(&near, &in, nTrail) ){
fts5InstanceListAppend(&out, near.iCol, near.iStream, near.iOff);
}
}else{
bEof = fts5InstanceListNext(&in);
}
}
}
|
| | | | | | | | | | |
2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 |
if( pNext->nList==0 ){
pTrim->nList = 0;
}else{
int bEof = 0;
int nTrail = nNear + (pNext->nToken-1) + 1;
int nLead = nNear + (pTrim->nToken-1) + 1;
InstanceList lNear;
InstanceList in;
InstanceList out;
fts5InstanceListInit(pNext->aList, pNext->nList, &lNear);
fts5InstanceListInit(pTrim->aList, pTrim->nList, &in);
fts5InstanceListInit(pTrim->aList, pTrim->nList, &out);
fts5InstanceListNext(&lNear);
fts5InstanceListNext(&in);
while( bEof==0 ){
if( fts5IsNear(&lNear, &in, nTrail)
|| fts5IsNear(&in, &lNear, nLead)
){
/* The current position is a match. Append an entry to the output
** and advance the input cursor. */
fts5InstanceListAppend(&out, in.iCol, in.iStream, in.iOff);
bEof = fts5InstanceListNext(&in);
}else{
if( lNear.iCol<in.iCol || (lNear.iCol==in.iCol && lNear.iOff<in.iOff) ){
bEof = fts5InstanceListNext(&lNear);
}else if( lNear.iCol==in.iCol && lNear.iOff==in.iOff ){
bEof = fts5InstanceListNext(&in);
if( fts5IsNear(&lNear, &in, nTrail) ){
fts5InstanceListAppend(&out, lNear.iCol, lNear.iStream, lNear.iOff);
}
}else{
bEof = fts5InstanceListNext(&in);
}
}
}
|