From 051c9ba1be8710c02dbf82fb733099ebc0188bef Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 16 Sep 2021 17:02:59 +0000 Subject: [PATCH] Add a single new ALWAYS() to rtree.c, with justification. FossilOrigin-Name: 778e4499cdf2083d5431738099dedf0aade9271f661e09ca3278e0109bb1e720 --- ext/rtree/rtree.c | 4 +++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 86080034db..6d67cc8234 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -2800,7 +2800,9 @@ static int fixBoundingBox(Rtree *pRtree, RtreeNode *pNode){ } box.iRowid = pNode->iNode; rc = nodeParentIndex(pRtree, pNode, &ii); - if( rc==SQLITE_OK ){ + /* When we are fixing up a bounding box, we've already + ** vvvvvv--- decended down through the tree so we know it is correct */ + if( ALWAYS(rc==SQLITE_OK) ){ nodeOverwriteCell(pRtree, pParent, &box, ii); rc = fixBoundingBox(pRtree, pParent); } diff --git a/manifest b/manifest index cc2636ca7d..b7d456fff2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\stag\scomment\sin\srtree.c.\s\sNo\schanges\sto\scode. -D 2021-09-16T16:41:59.880 +C Add\sa\ssingle\snew\sALWAYS()\sto\srtree.c,\swith\sjustification. +D 2021-09-16T17:02:59.528 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -393,7 +393,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/geopoly.c 98d45533989e908bf65b43f36ff6eaad95a9ffe6f3b6b8658fbd47d45c58b10b -F ext/rtree/rtree.c c11785b7ba6c8ac24104fd06adac1fdb7209717cfa661ea94faf38d271ea216c +F ext/rtree/rtree.c c9e2c4b76254948c71843e97409f3b6f10a7f7b275d3a28cbd68a81eba9fcfe1 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d @@ -1923,7 +1923,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 e54a33ce56432b23947583d34cf12fc64a55bbc49eb77c7f33cff5926df51070 -R 0f426986a95a79cde4e578a0d0df1ebf +P 213410fa9cceb4ce34bf590ba65648ebeb94cc8d0c29a8881222208097162a95 +R 06089782d82474a82865a82e74d66a14 U drh -Z 9c4125bd62e8a7798b0a4bb99a1d21ed +Z 53f2756b94560157f28ee71e2faea628 diff --git a/manifest.uuid b/manifest.uuid index b14aaf362d..e76545cb17 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -213410fa9cceb4ce34bf590ba65648ebeb94cc8d0c29a8881222208097162a95 \ No newline at end of file +778e4499cdf2083d5431738099dedf0aade9271f661e09ca3278e0109bb1e720 \ No newline at end of file