From: dan <dan@noemail.net>
Date: Wed, 11 Aug 2010 12:26:46 +0000 (+0000)
Subject: Update an r-tree extension test case to account for recent changes to the query plann... 
X-Git-Tag: version-3.7.2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=036391f7f8c55b6e04fa725b7875c93eef95506f;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: eaaca669a4afc83906806b22365b010c83bc3db8
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 6576db1412..0bc4dd7e1c 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -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
diff --git a/ext/rtree/rtree6.test b/ext/rtree/rtree6.test
index d23a74e06c..bab596e015 100644
--- a/ext/rtree/rtree6.test
+++ b/ext/rtree/rtree6.test
@@ -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
diff --git a/manifest b/manifest
index 1f2a251f83..8dcf36d7e6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\ssqlite3DbFree()\sinstead\sof\ssqlite3_free()\sto\sfree\sany\serror\smessage\sreported\sby\sthe\sparser\slayer\swhile\sattempting\sto\sparse\sa\sCREATE\sTABLE\sstatement\spassed\sto\ssqlite3_declare_vtab().
-D 2010-08-11T11:59:38
+C Update\san\sr-tree\sextension\stest\scase\sto\saccount\sfor\srecent\schanges\sto\sthe\squery\splanner.\sAlso\sfix\sa\scomment\sin\srtree.c.
+D 2010-08-11T12:26:46
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,14 +78,14 @@ F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
 F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c c7a18311f2d6ae9a42838e9c04b9e670483b4feb
+F ext/rtree/rtree.c f2fbb6470155316027a8b888e8623bc1819fe443
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 51bb0cd0405970501e63258401ae5ad235a4f468
 F ext/rtree/rtree2.test 7b665c44d25e51b3098068d983a39902b2e2d7a1
 F ext/rtree/rtree3.test dece988c363368af8c11862995c762071894918f
 F ext/rtree/rtree4.test 94fdd570ab5bc47244d87d4590023be43ac786bd
 F ext/rtree/rtree5.test 92508f5152a50110af6551fa5b769d1bbd7c4ef3
-F ext/rtree/rtree6.test 11aade5311789068ca659be24a47cc0d852b1971
+F ext/rtree/rtree6.test 903720aaab819764c3693aaac0affe8174104ac8
 F ext/rtree/rtree7.test 6fd29fb8e13795c822f4ceeea92ab5d61c96976d
 F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
 F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
@@ -843,7 +843,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ea9eaf7480f6fbe2a37813508d1b730d45155966
-R 5cf5e11c7819da65780bea10cbcb63a2
+P 7c674aaba52b00a78babc1e1ece7e5b652b65039
+R e8f0a89b3e6e46377528a5271511edf8
 U dan
-Z d42c7208733aa84b0734a3cdeb0c0ed1
+Z ddfd9f64a4ee25bfe95e56a61185d67f
diff --git a/manifest.uuid b/manifest.uuid
index 0169067de3..0f05938afe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c674aaba52b00a78babc1e1ece7e5b652b65039
\ No newline at end of file
+eaaca669a4afc83906806b22365b010c83bc3db8
\ No newline at end of file