Completely unroll the dimension loop inside of cellArea() in RTREE.

FossilOrigin-Name: 3c4c0126c287f844220b65e00fec17c059fbb7c8

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 7e8b7b2b48667e532cc72690a3a9c1a23c236bd5..4d67d6704471a76523539970ff909b0ae2a55bf3 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1879,11 +1879,27 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 ** Return the N-dimensional volumn of the cell stored in *p.
 */
 static RtreeDValue cellArea(Rtree *pRtree, RtreeCell *p){
-  RtreeDValue area;
-  int ii;
-  area = DCOORD(p->aCoord[1]) - DCOORD(p->aCoord[0]);
-  for(ii=2; ii<pRtree->nDim2; ii+=2){
-    area *= DCOORD(p->aCoord[ii+1]) - DCOORD(p->aCoord[ii]);
+  RtreeDValue area = (RtreeDValue)1;
+  assert( pRtree->nDim>=1 && pRtree->nDim<=5 );
+#ifndef SQLITE_RTREE_INT_ONLY
+  if( pRtree->eCoordType==RTREE_COORD_REAL32 ){
+    switch( pRtree->nDim ){
+      case 5:  area  = p->aCoord[9].f - p->aCoord[8].f;
+      case 4:  area *= p->aCoord[7].f - p->aCoord[6].f;
+      case 3:  area *= p->aCoord[5].f - p->aCoord[4].f;
+      case 2:  area *= p->aCoord[3].f - p->aCoord[2].f;
+      default: area *= p->aCoord[1].f - p->aCoord[0].f;
+    }
+  }else
+#endif
+  {
+    switch( pRtree->nDim ){
+      case 5:  area  = p->aCoord[9].i - p->aCoord[8].i;
+      case 4:  area *= p->aCoord[7].i - p->aCoord[6].i;
+      case 3:  area *= p->aCoord[5].i - p->aCoord[4].i;
+      case 2:  area *= p->aCoord[3].i - p->aCoord[2].i;
+      default: area *= p->aCoord[1].i - p->aCoord[0].i;
+    }
   }
   return area;
 }

diff --git a/manifest b/manifest
index 47d8c1d927de7a381ba095ac37710aec96ec6775..62887ba81435f8f9f2a11c965d78f95a6698da43 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Precompute\sthe\snDim2\svalue\sin\sthe\sRtree\sobject\sand\suse\sthat\sto\smake\sloops\nover\scoordinates\sfaster.
-D 2017-02-01T15:49:02.390
+C Completely\sunroll\sthe\sdimension\sloop\sinside\sof\scellArea()\sin\sRTREE.
+D 2017-02-01T16:41:30.471
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -264,7 +264,7 @@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d55a097238a434b7e99caf318
 F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
 F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c bc73bae0af0d44f92b7d6cb513b719c1e89a7a20
+F ext/rtree/rtree.c 60df707ce5ae232351fc7fc8e916738b1a06bf26
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1552,7 +1552,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 82fcd54a5941c20895ffc22d8009c1ebdae44eda
-R 2d19b39f1fe0fa1365532dfac9c432a7
+P f1f3c8cc733a05c12dd980f2dfa0ab4ccd76c04b
+R f244aabca54009b102530102725b0e43
 U drh
-Z 1d3fc5da859da34aeaaaf616405346d2
+Z 396b9b4a99bf06a5c73ba01696403f75

diff --git a/manifest.uuid b/manifest.uuid
index 5d3a3937af28bf98813f150096ed948738035a38..a4a1237e470111c89152e9610adb2bf7faa14ba4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f1f3c8cc733a05c12dd980f2dfa0ab4ccd76c04b
\ No newline at end of file
+3c4c0126c287f844220b65e00fec17c059fbb7c8
\ No newline at end of file