Fix a bug in r-tree related to internal nodes with one or more dimensions of size...

FossilOrigin-Name: 8b600ed083d48784df4b1da1320a01bebbf233d7

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index f306113fcb5278ee5569eca22a9cf9c77d6846c9..b41816917b0633b23a540e2d560f2db22911cc5f 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -12,7 +12,7 @@
 ** This file contains code for implementations of the r-tree and r*-tree
 ** algorithms packaged as an SQLite virtual table module.
 **
-** $Id: rtree.c,v 1.8 2008/09/01 12:47:00 danielk1977 Exp $
+** $Id: rtree.c,v 1.9 2008/09/08 11:07:03 danielk1977 Exp $
 */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -1224,6 +1224,25 @@ static void cellUnion(Rtree *pRtree, RtreeCell *p1, RtreeCell *p2){
   }
 }
 
+/*
+** Return true if the area covered by p2 is a subset of the area covered
+** by p1. False otherwise.
+*/
+static int cellContains(Rtree *pRtree, RtreeCell *p1, RtreeCell *p2){
+  int ii;
+  int isInt = (pRtree->eCoordType==RTREE_COORD_INT32);
+  for(ii=0; ii<(pRtree->nDim*2); ii+=2){
+    RtreeCoord *a1 = &p1->aCoord[ii];
+    RtreeCoord *a2 = &p2->aCoord[ii];
+    if( (!isInt && (a2[0].f<a1[0].f || a2[1].f>a1[1].f)) 
+     || ( isInt && (a2[0].i<a1[0].i || a2[1].i>a1[1].i)) 
+    ){
+      return 0;
+    }
+  }
+  return 1;
+}
+
 /*
 ** Return the amount cell p would grow by if it were unioned with pCell.
 */
@@ -1390,7 +1409,7 @@ static void AdjustTree(
     int iCell = nodeParentIndex(pRtree, p);
 
     nodeGetCell(pRtree, pParent, iCell, &cell);
-    if( cellGrowth(pRtree, &cell, pCell)>0.0 ){
+    if( !cellContains(pRtree, &cell, pCell) ){
       cellUnion(pRtree, &cell, pCell);
       nodeOverwriteCell(pRtree, pParent, &cell, iCell);
     }

diff --git a/ext/rtree/tkt3363.test b/ext/rtree/tkt3363.test
new file mode 100644 (file)
index 0000000..11c5192
--- /dev/null
+++ b/ext/rtree/tkt3363.test
@@ -0,0 +1,54 @@
+# 2008 Sep 08
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# The focus of this file is testing that ticket #3363 is fixed.
+#
+# $Id: tkt3363.test,v 1.1 2008/09/08 11:07:03 danielk1977 Exp $
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname $argv0] .. .. test]
+}
+source [file join [file dirname [info script]] rtree_util.tcl]
+source $testdir/tester.tcl
+
+ifcapable !rtree {
+  finish_test
+  return
+}
+
+do_test tkt3363.1.1 {
+  execsql { CREATE VIRTUAL TABLE t1 USING rtree(ii, x1, x2, y1, y2) }
+} {}
+
+do_test tkt3363.1.2 {
+  for {set ii 1} {$ii < 50} {incr ii} {
+    set x 1000000
+    set y [expr 4000000 + $ii*10]
+    execsql { INSERT INTO t1 VALUES($ii, $x, $x, $y, $y) }
+  }
+} {}
+
+do_test tkt3363.1.3 {
+  execsql { 
+    SELECT count(*) FROM t1 WHERE +y2>4000425.0;
+  }
+} {7}
+
+do_test tkt3363.1.4 {
+  execsql { 
+    SELECT count(*) FROM t1 WHERE y2>4000425.0;
+  }
+} {7}
+
+finish_test
+
+

diff --git a/manifest b/manifest
index 67e3ddda8730717430ca902abfa4460c1ee5a631..a75ee8b58fb64fe1d922f816108faa61b7b6193c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthe\s'rootpage'\scolumn\sof\sthe\ssqlite_master\stable\scontains\sa\sNULL\svalue,\sreturn\sSQLITE_CORRUPT\sto\sthe\scaller.\s(CVS\s5681)
-D 2008-09-08T09:06:19
+C Fix\sa\sbug\sin\sr-tree\srelated\sto\sinternal\snodes\swith\sone\sor\smore\sdimensions\sof\ssize\szero.\sTicket\s#3363.\s(CVS\s5682)
+D 2008-09-08T11:07:03
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,7 +65,7 @@ F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 5e372fdbe572ae8e4e3b4917f048e842dcb57915
+F ext/rtree/rtree.c 9a9ef98ea5c36841cedf95d8cfbe79ebb411fef6
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 620223886bf1a319317e63235aac20790375c544
 F ext/rtree/rtree2.test 9ac9d28fa948779df66916c67a5dcf9704c3cb74
@@ -75,6 +75,7 @@ F ext/rtree/rtree5.test 7d0643482829038f0263881ddf7e2d51bff1d60f
 F ext/rtree/rtree6.test fdfaf62bf026f1312c6eca658979800f3c0bc93f
 F ext/rtree/rtree_perf.tcl 0fabb6d5c48cb8024e042ce5d4bb88998b6ec1cb
 F ext/rtree/rtree_util.tcl ee0a0311eb12175319d78bfb37302320496cee6e
+F ext/rtree/tkt3363.test 6662237ea75bb431cd5d262dfc9535e1023315fc
 F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
@@ -632,7 +633,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 79364b963b348d5433da737b4e21e97952882389
-R 39b97310e19679d7df923788ff2f1b2d
+P a7b7b126e9e9b0cd2d68643d8dff321cf41ce2ee
+R 7a5557b83cc6a1a73277a849ba33fee0
 U danielk1977
-Z 99c7b68e3038fbf05d1b53e87e37df07
+Z f7a6166717d192feb4eb993c1d3b14c3

diff --git a/manifest.uuid b/manifest.uuid
index f40cd53f0af74830c36cd089190cc60462ab6b70..26eafc0dc460655302f9f048054f4d16ec2c3c30 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7b7b126e9e9b0cd2d68643d8dff321cf41ce2ee
\ No newline at end of file
+8b600ed083d48784df4b1da1320a01bebbf233d7
\ No newline at end of file