Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an off-by-one error in setting the "iLevel" field of the sqlite3_rtree_query_info structure passed into the RTree query callback. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rtree-enhancements |
| Files: | files | file ages | folders |
| SHA1: |
d708f159abfb3b87e2844463088d4fb7 |
| User & Date: | drh 2014-04-21 15:21:19 |
Context
|
2014-04-21
| ||
| 15:53 | Be sure to initialize the sqlite3_rtree_query_info.iRowid field for the leaves of the R-Tree when doing a query callback search. (check-in: 43946938 user: drh tags: rtree-enhancements) | |
| 15:21 | Fix an off-by-one error in setting the "iLevel" field of the sqlite3_rtree_query_info structure passed into the RTree query callback. (check-in: d708f159 user: drh tags: rtree-enhancements) | |
|
2014-04-18
| ||
| 01:37 | Further improvements to the RTREE_DECODE_COORD() method, to take advantage of known processor byte orders when available. This makes the code 3% faster, according to valgrind. Also add test cases to make sure the on-disk representation is correct. (check-in: 6f3e94f4 user: drh tags: rtree-enhancements) | |
Changes
Changes to ext/rtree/rtree.c.
969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 |
if( pConstraint->op==RTREE_MATCH ){
rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo,
nCoord, aCoord, &i);
if( i==0 ) *peWithin = NOT_WITHIN;
*prScore = RTREE_ZERO;
}else{
pInfo->aCoord = aCoord;
pInfo->iLevel = pSearch->iLevel;
pInfo->rScore = pInfo->rParentScore = pSearch->rScore;
pInfo->eWithin = pInfo->eParentWithin = pSearch->eWithin;
rc = pConstraint->u.xQueryFunc(pInfo);
if( pInfo->eWithin<*peWithin ) *peWithin = pInfo->eWithin;
if( pInfo->rScore<*prScore || *prScore<RTREE_ZERO ){
*prScore = pInfo->rScore;
}
|
| |
969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 |
if( pConstraint->op==RTREE_MATCH ){
rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo,
nCoord, aCoord, &i);
if( i==0 ) *peWithin = NOT_WITHIN;
*prScore = RTREE_ZERO;
}else{
pInfo->aCoord = aCoord;
pInfo->iLevel = pSearch->iLevel - 1;
pInfo->rScore = pInfo->rParentScore = pSearch->rScore;
pInfo->eWithin = pInfo->eParentWithin = pSearch->eWithin;
rc = pConstraint->u.xQueryFunc(pInfo);
if( pInfo->eWithin<*peWithin ) *peWithin = pInfo->eWithin;
if( pInfo->rScore<*prScore || *prScore<RTREE_ZERO ){
*prScore = pInfo->rScore;
}
|
Changes to src/test_rtree.c.
254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
p->rScore = p->iLevel;
}else if( pCircle->eScoreType==2 ){
/* Breadth first search */
p->rScore = 100 - p->iLevel;
}else{
/* Depth-first search, except sort the leaf nodes by area with
** the largest area first */
if( p->iLevel==2 ){
p->rScore = 1.0 - (xmax-xmin)*(ymax-ymin)/pCircle->mxArea;
if( p->rScore<0.01 ) p->rScore = 0.01;
}else{
p->rScore = 0.0;
}
}
if( nWithin==0 ){
|
| |
254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
p->rScore = p->iLevel;
}else if( pCircle->eScoreType==2 ){
/* Breadth first search */
p->rScore = 100 - p->iLevel;
}else{
/* Depth-first search, except sort the leaf nodes by area with
** the largest area first */
if( p->iLevel==1 ){
p->rScore = 1.0 - (xmax-xmin)*(ymax-ymin)/pCircle->mxArea;
if( p->rScore<0.01 ) p->rScore = 0.01;
}else{
p->rScore = 0.0;
}
}
if( nWithin==0 ){
|