database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Fix a bug in rowid=? query handling. More problems remain.

Browse Source 
FossilOrigin-Name: 5b0e6ba4a5050cf81cf41b977b28d714163569e0
This commit is contained in:
drh
2014-04-16 14:45:11 +00:00
parent f247982e37
commit ab908cfcb4
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ext/rtree/rtree.c
View File

@ -1230,6 +1230,7 @@ static void traceQueue(RtreeCursor *pCur, const char *zPrefix){
tracePoint(&pCur->aPoint[ii], ii, pCur);
}
}
# define RTREE_QUEUE_TRACE(A,B) traceQueue(A,B)
#else
# define RTREE_QUEUE_TRACE(A,B) /* no-op */
#endif
@ -1284,7 +1285,6 @@ static void rtreeSearchPointPop(RtreeCursor *p){
*/
static int rtreeStepToLeaf(RtreeCursor *pCur){
RtreeSearchPoint *p;
RtreeSearchPoint *pNew;
Rtree *pRtree = RTREE_OF_CURSOR(pCur);
RtreeNode *pNode;
int eWithin;
@ -1313,17 +1313,16 @@ static int rtreeStepToLeaf(RtreeCursor *pCur){
RTREE_QUEUE_TRACE(pCur, "POP-S:");
rtreeSearchPointPop(pCur);
}
pNew = rtreeSearchPointNew(pCur, /*rScore*/0.0, x.iLevel-1);
if( pNew==0 ) return SQLITE_NOMEM;
pNew->eWithin = eWithin;
if( pNew->iLevel ){
pNew->id = cell.iRowid;
pNew->iCell = 0;
p = rtreeSearchPointNew(pCur, /*rScore*/0.0, x.iLevel-1);
if( p==0 ) return SQLITE_NOMEM;
p->eWithin = eWithin;
if( p->iLevel ){
p->id = cell.iRowid;
p->iCell = 0;
}else{
pNew->id = x.id;
pNew->iCell = x.iCell;
p->id = x.id;
p->iCell = x.iCell;
}
p = pNew;
RTREE_QUEUE_TRACE(pCur, "PUSH-S:");
break;
}
@ -1496,7 +1495,9 @@ static int rtreeFilter(
rc = findLeafNode(pRtree, iRowid, &pLeaf, &p->id);
pCsr->aNode[0] = pLeaf;
p->eWithin = PARTLY_WITHIN;
if( rc ) rc = nodeRowidIndex(pRtree, pLeaf, iRowid, &iCell);
if( rc==SQLITE_OK ){
rc = nodeRowidIndex(pRtree, pLeaf, iRowid, &iCell);
}
p->iCell = iCell;
RTREE_QUEUE_TRACE(pCsr, "PUSH-F1:");
}else{