database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Update an r-tree extension test case to account for recent changes to the query planner. Also fix a comment in rtree.c.

Browse Source 
FossilOrigin-Name: eaaca669a4afc83906806b22365b010c83bc3db8
This commit is contained in:
dan
2010-08-11 12:26:46 +00:00
parent 78f9b73189
commit 036391f7f8
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/rtree/rtree.c
View File

@ -1072,11 +1072,10 @@ static int rtreeFilter(
** idxNum idxStr Strategy
** ------------------------------------------------
** 1 Unused Direct lookup by rowid.
** 2 See below R-tree query.
** 3 Unused Full table scan.
** 2 See below R-tree query or full-table scan.
** ------------------------------------------------
**
** If strategy 1 or 3 is used, then idxStr is not meaningful. If strategy
** If strategy 1 is used, then idxStr is not meaningful. If strategy
** 2 is used, idxStr is formatted to contain 2 bytes for each
** constraint used. The first two bytes of idxStr correspond to
** the constraint in sqlite3_index_info.aConstraintUsage[] with

8
ext/rtree/rtree6.test
View File

@ -88,8 +88,8 @@ do_test rtree6.2.2 {
do_test rtree6.2.3 {
query_plan {SELECT * FROM t1,t2 WHERE k=ii}
} [list \
{TABLE t2} \
{TABLE t1 VIRTUAL TABLE INDEX 1:} \
{TABLE t1 VIRTUAL TABLE INDEX 2:} \
{TABLE t2 USING PRIMARY KEY} \
]
do_test rtree6.2.4 {
@ -102,8 +102,8 @@ do_test rtree6.2.4 {
do_test rtree6.2.5 {
query_plan {SELECT * FROM t1,t2 WHERE k=ii AND x1<v}
} [list \
{TABLE t2} \
{TABLE t1 VIRTUAL TABLE INDEX 1:} \
{TABLE t1 VIRTUAL TABLE INDEX 2:} \
{TABLE t2 USING PRIMARY KEY} \
]
finish_test