From: drh <drh@noemail.net>
Date: Thu, 27 Sep 2018 20:37:52 +0000 (+0000)
Subject: Enhance the GeoPOLY extension so that it always stores its polygons in the
X-Git-Tag: version-3.26.0~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50db3e8d5108f3796d845a02d8d6aa2f221cafa1;p=thirdparty%2Fsqlite.git

Enhance the GeoPOLY extension so that it always stores its polygons in the
binary format, which is faster and more compact.

FossilOrigin-Name: dc35f7b1754a78fa0d70c92754de07bb3c28d0d31cb929ee8a3a47ac4f3d446e
---

diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c
index a34ca12fc7..bbbbf3e7d5 100644
--- a/ext/rtree/geopoly.c
+++ b/ext/rtree/geopoly.c
@@ -1548,7 +1548,16 @@ static int geopolyUpdate(
     if( sqlite3_value_nochange(aData[2]) ){
       sqlite3_bind_null(pUp, 2);
     }else{
-      sqlite3_bind_value(pUp, 2, aData[2]);
+      GeoPoly *p = 0;
+      if( sqlite3_value_type(aData[2])==SQLITE_TEXT
+       && (p = geopolyFuncParam(0, aData[2], &rc))!=0
+       && rc==SQLITE_OK
+      ){
+        sqlite3_bind_blob(pUp, 2, p->hdr, 4+8*p->nVertex, SQLITE_TRANSIENT);
+      }else{
+        sqlite3_bind_value(pUp, 2, aData[2]);
+      }
+      sqlite3_free(p);
       nChange = 1;
     }
     for(jj=1; jj<pRtree->nAux; jj++){
diff --git a/manifest b/manifest
index 95d4083ba5..2ecfedf071 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sOP_VColumn\sopcode\sdoes\sset\ssqlite3_vtab_nochange()\sunless\nthe\sOPFLAG_NOCHNG\sbit\sis\sset\sin\sP5.\s\sFix\sfor\sticket\n[69d642332d25aa3b7315a6d385]
-D 2018-09-27T20:20:01.637
+C Enhance\sthe\sGeoPOLY\sextension\sso\sthat\sit\salways\sstores\sits\spolygons\sin\sthe\nbinary\sformat,\swhich\sis\sfaster\sand\smore\scompact.
+D 2018-09-27T20:37:52.082
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -361,7 +361,7 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782
 F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/geopoly.c 415a8ca5dfab54eea779e0bf31a859afb0b869a5147a726df4aec4b57c1bad57
+F ext/rtree/geopoly.c 470c928b8d28321f46620eef1cf986a769b46f39e2175c74b8affa8df2a293ad
 F ext/rtree/rtree.c 6cc2e673cf1e9ea1619f13ab990f12389dfb951b131acbc2fbe164cee8992a20
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
@@ -1770,7 +1770,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 4c1fed60b9b35ac2f5d2f2533b54db429d72bdbc0aad0dd5af52ff851789d4ae
-R 4de9cd6272060b40e8360d9dcb419bf1
+P 322ab1fc613f616e9f07dc94ef74a29572a21cc476d88e97b4ce865500a47b62
+R 8f3d6e164234f97a7fd2cd2e24f8d737
 U drh
-Z 328571ee81991b66e5e9a58d87f0ffc1
+Z ff6e72fa7555d5408cc034538f340086
diff --git a/manifest.uuid b/manifest.uuid
index d48100cfa2..4e78013d81 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-322ab1fc613f616e9f07dc94ef74a29572a21cc476d88e97b4ce865500a47b62
\ No newline at end of file
+dc35f7b1754a78fa0d70c92754de07bb3c28d0d31cb929ee8a3a47ac4f3d446e
\ No newline at end of file