[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-25-g2ff0afaef
git at osgeo.org
git at osgeo.org
Fri Jun 10 21:34:12 PDT 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 2ff0afaef752fb447b2922b963ea987f310f0887 (commit)
via 3f4ee2320bb2e0cf94dd2d6aaee23d5c866d2805 (commit)
from 46e6b122f2a96c23aea37f5bcc25cf9ffc944cda (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2ff0afaef752fb447b2922b963ea987f310f0887
Author: Regina Obe <lr at pcorp.us>
Date: Sat Jun 11 00:31:46 2022 -0400
Add Z option to raster2pgsql that allows for specifying number of rows
per SQL COPY. Closes #5170
Add credits for ST_SimplifyPolygonHull to news, References #5169
diff --git a/NEWS b/NEWS
index ffbaf04fe..88607d974 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,13 @@ PostGIS 3.3.0dev
2022/XX/XX
Changes since PostGIS 3.3.0alpha1
* Enhancements *
- - #5158 pgtopo_import / pgtopo_export manpages
+ - #5158, pgtopo_import / pgtopo_export manpages (Sandro Santilli)
+ - #5170, add a -Z option to raster2pgsql to
+ control number of rows per copy statement (Regina Obe)
+
+* New features *
+ - #5169, ST_SimplifyPolygonHull (requires GEOS 3.11)
+ Paul Ramsey, Martin Davis
PostGIS 3.3.0alpha1
diff --git a/raster/loader/raster2pgsql.c b/raster/loader/raster2pgsql.c
index e7317c117..cd7f772c5 100644
--- a/raster/loader/raster2pgsql.c
+++ b/raster/loader/raster2pgsql.c
@@ -428,7 +428,7 @@ usage() {
" -N <nodata> NODATA value to use on bands without a NODATA value.\n"
));
printf(_(
- " -k Skip NODATA value checks for each raster band.\n"
+ " -k Keep empty tiles by skipping NODATA value checks for each raster band. \n"
));
printf(_(
" -E <endian> Control endianness of generated binary output of\n"
@@ -445,6 +445,10 @@ usage() {
printf(_(
" -Y Use COPY statements instead of INSERT statements.\n"
));
+
+ printf(_(
+ " -Z Set max insert rows per COPY statement. Only does something with -Y. Default is 11 if not specified.\n"
+ ));
printf(_(
" -G Print the supported GDAL raster formats.\n"
));
@@ -700,6 +704,7 @@ init_config(RTLOADERCFG *config) {
config->version = 0;
config->transaction = 1;
config->copy_statements = 0;
+ config->max_tiles_per_copy = 11;
}
static void
@@ -1515,7 +1520,7 @@ build_overview(int idx, RTLOADERCFG *config, RASTERINFO *info, uint32_t ovx, STR
GDALClose(hdsDst);
/* flush if tileset gets too big */
- if (tileset->length > 10) {
+ if (tileset->length >= config->max_tiles_per_copy) {
if (!insert_records(
config->schema, ovtable, config->raster_column,
(config->file_column ? config->rt_filename[idx] : NULL), config->file_column_name,
@@ -1842,7 +1847,7 @@ convert_raster(int idx, RTLOADERCFG *config, RASTERINFO *info, STRINGBUFFER *til
append_stringbuffer(tileset, hex);
/* flush if tileset gets too big */
- if (tileset->length > 10) {
+ if (tileset->length >= config->max_tiles_per_copy ) {
if (!insert_records(
config->schema, config->table, config->raster_column,
(config->file_column ? config->rt_filename[idx] : NULL), config->file_column_name,
@@ -1965,7 +1970,7 @@ convert_raster(int idx, RTLOADERCFG *config, RASTERINFO *info, STRINGBUFFER *til
GDALClose(hdsDst);
/* flush if tileset gets too big */
- if (tileset->length > 10) {
+ if (tileset->length >= config->max_tiles_per_copy ) {
if (!insert_records(
config->schema, config->table, config->raster_column,
(config->file_column ? config->rt_filename[idx] : NULL), config->file_column_name,
@@ -2596,6 +2601,11 @@ main(int argc, char **argv) {
else if (CSEQUAL(argv[argit], "-Y")) {
config->copy_statements = 1;
}
+
+ /* max tiles per copy */
+ else if (CSEQUAL(argv[argit], "-Z") && argit < argc - 1) {
+ config->max_tiles_per_copy = atof(argv[++argit]);
+ }
/* GDAL formats */
else if (CSEQUAL(argv[argit], "-G")) {
uint32_t drv_count = 0;
diff --git a/raster/loader/raster2pgsql.h b/raster/loader/raster2pgsql.h
index 85d5a1a35..62f4abec6 100644
--- a/raster/loader/raster2pgsql.h
+++ b/raster/loader/raster2pgsql.h
@@ -159,6 +159,9 @@ typedef struct raster_loader_config {
/* use COPY instead of INSERT */
int copy_statements;
+ /** max tiles per copy */
+ int max_tiles_per_copy;
+
} RTLOADERCFG;
typedef struct rasterinfo_t {
diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index 6492bb99c..4cf4dc03e 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -161,7 +161,8 @@ TEST_LOADER = \
loader/Tiled10x10Copy \
loader/Tiled8x8 \
loader/TiledAuto \
- loader/TiledAutoSkipNoData
+ loader/TiledAutoSkipNoData \
+ loader/TiledAutoZCopy
RASTER_TESTS := $(TEST_FIRST) \
$(TEST_METADATA) $(TEST_IO) $(TEST_BASIC_FUNC) \
diff --git a/raster/test/regress/loader/TiledAutoZCopy.opts b/raster/test/regress/loader/TiledAutoZCopy.opts
new file mode 100644
index 000000000..c0810c3e4
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoZCopy.opts
@@ -0,0 +1 @@
+-t auto -C -Y -Z 20
diff --git a/raster/test/regress/loader/TiledAutoZCopy.select.expected b/raster/test/regress/loader/TiledAutoZCopy.select.expected
new file mode 100644
index 000000000..8351c1939
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoZCopy.select.expected
@@ -0,0 +1 @@
+14
diff --git a/raster/test/regress/loader/TiledAutoZCopy.select.sql b/raster/test/regress/loader/TiledAutoZCopy.select.sql
new file mode 100644
index 000000000..81d831770
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoZCopy.select.sql
@@ -0,0 +1 @@
+select count(*) from loadedrast;
diff --git a/raster/test/regress/loader/TiledAutoZCopy.sql b/raster/test/regress/loader/TiledAutoZCopy.sql
new file mode 100644
index 000000000..81d831770
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoZCopy.sql
@@ -0,0 +1 @@
+select count(*) from loadedrast;
diff --git a/raster/test/regress/loader/TiledAutoZCopy.tif.ref b/raster/test/regress/loader/TiledAutoZCopy.tif.ref
new file mode 100644
index 000000000..a7c066dc8
--- /dev/null
+++ b/raster/test/regress/loader/TiledAutoZCopy.tif.ref
@@ -0,0 +1 @@
+testraster2.tif
diff --git a/raster/test/regress/tests.mk b/raster/test/regress/tests.mk
index 7dccaeb45..92676bb42 100644
--- a/raster/test/regress/tests.mk
+++ b/raster/test/regress/tests.mk
@@ -133,7 +133,8 @@ RASTER_TEST_LOADER = \
$(topsrcdir)/raster/test/regress/loader/Tiled10x10Copy \
$(topsrcdir)/raster/test/regress/loader/Tiled8x8 \
$(topsrcdir)/raster/test/regress/loader/TiledAuto \
- $(topsrcdir)/raster/test/regress/loader/TiledAutoSkipNoData
+ $(topsrcdir)/raster/test/regress/loader/TiledAutoSkipNoData \
+ $(topsrcdir)/raster/test/regress/loader/TiledAutoZCopy
RASTER_TESTS := $(RASTER_TEST_FIRST) \
$(RASTER_TEST_METADATA) $(RASTER_TEST_IO) $(RASTER_TEST_BASIC_FUNC) \
commit 3f4ee2320bb2e0cf94dd2d6aaee23d5c866d2805
Author: Regina Obe <lr at pcorp.us>
Date: Fri Jun 10 23:47:06 2022 -0400
Change berries to test against PG15
diff --git a/ci/berrie/configs.sh b/ci/berrie/configs.sh
index ca0a5ca46..b91a960a3 100644
--- a/ci/berrie/configs.sh
+++ b/ci/berrie/configs.sh
@@ -2,7 +2,7 @@ export WORKSPACE=/home/jenkins/workspace
export GEOS_VER=3.11.0
export OS_BUILD=32
-export PG_VER=14
+export PG_VER=15
export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
#export GEOS_PATH=~/geos/rel-${GEOS_VER}
export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
index 5a7f90599..aa6d39049 100644
--- a/ci/berrie64/configs.sh
+++ b/ci/berrie64/configs.sh
@@ -2,7 +2,7 @@ export WORKSPACE=/home/jenkins/workspace
export GEOS_VER=3.11.0
export OS_BUILD=64
-export PG_VER=14
+export PG_VER=15
export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
#export GEOS_PATH=~/geos/rel-${GEOS_VER}
export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 +++++++-
ci/berrie/configs.sh | 2 +-
ci/berrie64/configs.sh | 2 +-
raster/loader/raster2pgsql.c | 18 ++++++++++++++----
raster/loader/raster2pgsql.h | 3 +++
raster/test/regress/Makefile.in | 3 ++-
raster/test/regress/loader/TiledAutoZCopy.opts | 1 +
....select.expected => TiledAutoZCopy.select.expected} | 0
...{TiledAuto.select.sql => TiledAutoZCopy.select.sql} | 0
.../{TiledAuto.select.sql => TiledAutoZCopy.sql} | 0
.../{TiledAuto.tif.ref => TiledAutoZCopy.tif.ref} | 0
raster/test/regress/tests.mk | 3 ++-
12 files changed, 31 insertions(+), 9 deletions(-)
create mode 100644 raster/test/regress/loader/TiledAutoZCopy.opts
copy raster/test/regress/loader/{TiledAutoSkipNoData.select.expected => TiledAutoZCopy.select.expected} (100%)
copy raster/test/regress/loader/{TiledAuto.select.sql => TiledAutoZCopy.select.sql} (100%)
copy raster/test/regress/loader/{TiledAuto.select.sql => TiledAutoZCopy.sql} (100%)
copy raster/test/regress/loader/{TiledAuto.tif.ref => TiledAutoZCopy.tif.ref} (100%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list