[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-642-g69e546bb5
git at osgeo.org
git at osgeo.org
Mon Feb 20 14:44:11 PST 2023
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 69e546bb5cd9a3d0c0e55d93163300a1bc4687f7 (commit)
via e22281c52f01b946070ad0094ba56be0ab602011 (commit)
via 5a82054a66681c52a1d54c08e11cf57f0678fb1a (commit)
from 9dec1cfef08480758b2647c631d3877a3dc15983 (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 69e546bb5cd9a3d0c0e55d93163300a1bc4687f7
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Feb 20 23:44:07 2023 +0100
gitlab-ci: reduce jobs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d5ffad62..b08fee201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,10 +25,8 @@
- echo "Build dir is ${PWD}"
- ${SRCDIR}/configure --without-raster CFLAGS="-Wall -fno-omit-frame-pointer -Werror"
- make
- - RUNTESTFLAGS=-v make check
- RUNTESTFLAGS="-v --dumprestore" make check-regress
- make install
- - RUNTESTFLAGS=-v make installcheck
- RUNTESTFLAGS="-v --dumprestore" make installcheck
- make distclean
- ${SRCDIR}/utils/check_distclean.sh
@@ -36,7 +34,3 @@
test:
image: debian:bookworm
<<: *build_definition
-
-test32:
- image: i386/debian:bookworm
- <<: *build_definition
commit e22281c52f01b946070ad0094ba56be0ab602011
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Feb 20 22:42:21 2023 +0100
Improve restore of topology dump from < 3.4.x
Skip restore of:
- addnode(varchar, geometry)
- pgis_geometry_union_finalfn(internal)
- st_clusterkmeans(geometry, integer)
- st_difference(geometry, geometry)
- st_force3d(geometry)
- st_force3dm(geometry)
- st_force3dz(geometry)
- st_force4d(geometry)
- st_intersection(geometry, geometry)
- st_subdivide(geometry, integer)
- st_symdifference(geometry, geometry)
- st_tileenvelope(integer, integer, integer, geometry)
- st_unaryunion(geometry)
- validatetopology(character varying)
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 253c327aa..a61c33f37 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -855,6 +855,7 @@ COMMENT FUNCTION st_curvetoline(geom geometry, tol double precision, toltype int
COMMENT FUNCTION st_delaunaytriangles(g1 geometry, tolerance double precision, flags integer)
COMMENT FUNCTION st_dfullywithin(rast1 raster, nband1 integer, rast2 raster, nband2 integer, distance double precision)
COMMENT FUNCTION st_dfullywithin(rast1 raster, rast2 raster, distance double precision)
+COMMENT FUNCTION st_difference(geom1 geometry, geom2 geometry)
COMMENT FUNCTION st_difference(geom1 geometry, geom2 geometry, gridsize double precision)
COMMENT FUNCTION st_dimension(geometry)
COMMENT FUNCTION st_disjoint(rast1 raster, nband1 integer, rast2 raster, nband2 integer)
@@ -935,6 +936,7 @@ COMMENT FUNCTION st_interiorringn(geometry, integer)
COMMENT FUNCTION st_interpolatepoint(line geometry, point geometry)
COMMENT FUNCTION st_interpolateraster(geom geometry, options text, rast raster, bandnumber integer)
COMMENT FUNCTION st_intersection(geography, geography)
+COMMENT FUNCTION st_intersection(geom1 geometry, geom2 geometry)
COMMENT FUNCTION st_intersection(geom1 geometry, geom2 geometry, gridsize double precision)
COMMENT FUNCTION st_intersection(geomin geometry, rast raster, band integer)
COMMENT FUNCTION st_intersection(rast1 raster, band1 integer, rast2 raster, band2 integer, nodataval double precision[])
@@ -1222,6 +1224,7 @@ COMMENT FUNCTION st_startpoint(geometry)
COMMENT FUNCTION st_stddev4ma(matrix double precision[], nodatamode text, VARIADIC args text[])
COMMENT FUNCTION st_stddev4ma(value double precision[], pos integer[], VARIADIC userargs text[])
COMMENT FUNCTION st_straightskeleton(geometry)
+COMMENT FUNCTION st_subdivide(geom geometry, maxvertices integer)
COMMENT FUNCTION st_subdivide(geom geometry, maxvertices integer, gridsize double precision)
COMMENT FUNCTION st_sum4ma(matrix double precision[], nodatamode text, VARIADIC args text[])
COMMENT FUNCTION st_sum4ma(value double precision[], pos integer[], VARIADIC userargs text[])
@@ -1231,6 +1234,7 @@ COMMENT FUNCTION st_summary(rast raster)
COMMENT FUNCTION st_summarystats(rast raster, exclude_nodata_value boolean)
COMMENT FUNCTION st_summarystats(rast raster, nband integer, exclude_nodata_value boolean)
COMMENT FUNCTION st_swapordinates(geom geometry, ords cstring)
+COMMENT FUNCTION st_symdifference(geom1 geometry, geom2 geometry)
COMMENT FUNCTION st_symdifference(geom1 geometry, geom2 geometry, gridsize double precision)
COMMENT FUNCTION st_tesselate(geometry)
COMMENT FUNCTION st_tileenvelope(zoom integer, x integer, y integer, bounds geometry, margin double precision)
@@ -1253,6 +1257,7 @@ COMMENT FUNCTION st_translate(geometry, double precision, double precision, doub
COMMENT FUNCTION st_transscale(geometry, double precision, double precision, double precision, double precision)
COMMENT FUNCTION st_triangulatepolygon(g1 geometry)
COMMENT FUNCTION st_tri(rast raster, nband integer, customextent raster, pixeltype text, interpolate_nodata boolean)
+COMMENT FUNCTION st_unaryunion(geometry)
COMMENT FUNCTION st_unaryunion(geometry, gridsize double precision)
COMMENT FUNCTION st_union(geom1 geometry, geom2 geometry)
COMMENT FUNCTION st_union(geom1 geometry, geom2 geometry, gridsize double precision)
@@ -1348,6 +1353,7 @@ FUNCTION addface(character varying, geometry, boolean)
FUNCTION addgeometrycolumn(character varying, character varying, character varying, character varying, integer, character varying, integer, boolean)
FUNCTION addgeometrycolumn(character varying, character varying, character varying, integer, character varying, integer, boolean)
FUNCTION addgeometrycolumn(character varying, character varying, integer, character varying, integer, boolean)
+FUNCTION addnode(character varying, geometry)
FUNCTION addnode(character varying, geometry, boolean, boolean)
FUNCTION _add_overview_constraint(name, name, name, name, name, name, integer)
FUNCTION addoverviewconstraints(name, name, name, name, integer)
@@ -1646,6 +1652,7 @@ FUNCTION pgis_asmvt_transfn(internal, anyelement, text)
FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer)
FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer, text)
FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer, text, text)
+FUNCTION pgis_geometry_union_finalfn(internal)
FUNCTION pgis_geometry_accum_transfn(internal, geometry)
FUNCTION pgis_geometry_accum_transfn(internal, geometry, double precision)
FUNCTION pgis_geometry_accum_transfn(internal, geometry, double precision, integer)
@@ -1950,6 +1957,7 @@ FUNCTION st_closestpoint(geometry, geometry)
FUNCTION st_closestpointofapproach(geometry, geometry)
FUNCTION st_clusterdbscan(geometry, double precision, integer)
FUNCTION st_clusterintersecting(geometry[])
+FUNCTION st_clusterkmeans(geometry, integer)
FUNCTION st_clusterkmeans(geometry, integer, double precision)
FUNCTION st_clusterwithin(geometry[], double precision)
FUNCTION st_collect(geometry[])
@@ -2017,6 +2025,7 @@ FUNCTION st_dfullywithin(geometry, geometry, double precision)
FUNCTION _st_dfullywithin(raster, integer, raster, integer, double precision)
FUNCTION st_dfullywithin(raster, integer, raster, integer, double precision)
FUNCTION st_dfullywithin(raster, raster, double precision)
+FUNCTION st_difference(geometry, geometry)
FUNCTION st_difference(geometry, geometry, double precision)
FUNCTION st_dimension(geometry)
FUNCTION st_disjoint(geometry, geometry)
@@ -2076,9 +2085,13 @@ FUNCTION st_findextent(text, text)
FUNCTION st_findextent(text, text, text)
FUNCTION st_flipcoordinates(geometry)
FUNCTION st_force2d(geometry)
+FUNCTION st_force3d(geometry)
FUNCTION st_force3d(geometry, double precision)
+FUNCTION st_force3dm(geometry)
FUNCTION st_force3dm(geometry, double precision)
+FUNCTION st_force3dz(geometry)
FUNCTION st_force3dz(geometry, double precision)
+FUNCTION st_force4d(geometry)
FUNCTION st_force4d(geometry, double precision, double precision)
FUNCTION st_forcecollection(geometry)
FUNCTION st_forcecurve(geometry)
@@ -2156,6 +2169,7 @@ FUNCTION st_interiorringn(geometry, integer)
FUNCTION st_interpolatepoint(geometry, geometry)
FUNCTION st_interpolateraster(geometry, text, raster, integer)
FUNCTION st_intersection(geography, geography)
+FUNCTION st_intersection(geometry, geometry)
FUNCTION st_intersection(geometry, geometry, double precision)
FUNCTION st_intersection(geometry, raster, integer)
FUNCTION st_intersection(raster, geometry)
@@ -2535,6 +2549,7 @@ FUNCTION st_startpoint(geometry)
FUNCTION st_stddev4ma(double precision[], integer[], text[])
FUNCTION st_stddev4ma(double precision[], text, text[])
FUNCTION st_straightskeleton(geometry)
+FUNCTION st_subdivide(geometry, integer)
FUNCTION st_subdivide(geometry, integer, double precision)
FUNCTION st_sum4ma(double precision[], integer[], text[])
FUNCTION st_sum4ma(double precision[], text, text[])
@@ -2549,9 +2564,11 @@ FUNCTION _st_summarystats_transfn(internal, raster, boolean, double precision)
FUNCTION _st_summarystats_transfn(internal, raster, integer, boolean)
FUNCTION _st_summarystats_transfn(internal, raster, integer, boolean, double precision)
FUNCTION st_swapordinates(geometry, cstring)
+FUNCTION st_symdifference(geometry, geometry)
FUNCTION st_symdifference(geometry, geometry, double precision)
FUNCTION st_symmetricdifference(geometry, geometry)
FUNCTION st_tesselate(geometry)
+FUNCTION st_tileenvelope(integer, integer, integer, geometry)
FUNCTION st_tileenvelope(integer, integer, integer, geometry, double precision)
FUNCTION st_tile(raster, integer, integer, boolean, double precision)
FUNCTION _st_tile(raster, integer, integer, integer[], boolean, double precision)
@@ -2581,6 +2598,7 @@ FUNCTION _st_tri4ma(double precision[], integer[], text[])
FUNCTION st_triangulatepolygon(geometry)
FUNCTION st_tri(raster, integer, raster, text, boolean)
FUNCTION st_tri(raster, integer, text, boolean)
+FUNCTION st_unaryunion(geometry)
FUNCTION st_unaryunion(geometry, double precision)
FUNCTION _st_union_finalfn(internal)
FUNCTION st_union(geometry[])
@@ -2674,6 +2692,7 @@ FUNCTION updategeometrysrid(character varying, character varying, integer)
FUNCTION updaterastersrid(name, name, integer)
FUNCTION _updaterastersrid(name, name, name, integer)
FUNCTION updaterastersrid(name, name, name, integer)
+FUNCTION validatetopology(character varying)
FUNCTION validatetopology(character varying, geometry)
FUNCTION _validatetopologyedgelinking(geometry)
FUNCTION _validatetopologygetfaceshellmaximaledgering(character varying, integer)
commit 5a82054a66681c52a1d54c08e11cf57f0678fb1a
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Feb 20 23:10:52 2023 +0100
run_test.pl: fix preparation of target db on --dumprestore
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 6afc54bd4..edbc7b56f 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -371,17 +371,6 @@ sub semver_lessthan
return @bcomp ? 1 : 0;
}
-if ( $OPT_UPGRADE )
-{
- print "Upgrading from postgis $libver\n";
-
- foreach my $hook (@OPT_HOOK_BEFORE_UPGRADE)
- {
- print "Running before-upgrade-script $hook\n";
- die unless load_sql_file($hook, 1);
- }
-}
-
if ( $OPT_DUMPRESTORE )
{
my $DBDUMP = dump_db();
@@ -401,21 +390,24 @@ if ( $OPT_DUMPRESTORE )
die;
}
- # Extension based spatial db do not need the target
- # database to be prepared in any way, script based
- # spatial db requires being prepared.
- if ( not $OPT_EXTENSIONS )
- {
- die unless prepare_spatial();
- }
-
die unless restore_db($DBDUMP);
+ # Update libver
+ $libver = sql("select postgis_lib_version()");
+
unlink($DBDUMP);
}
if ( $OPT_UPGRADE )
{
+ print "Upgrading from postgis $libver\n";
+
+ foreach my $hook (@OPT_HOOK_BEFORE_UPGRADE)
+ {
+ print "Running before-upgrade-script $hook\n";
+ die unless load_sql_file($hook, 1);
+ }
+
unless ( $OPT_DUMPRESTORE )
{
if ( $OPT_EXTENSIONS )
@@ -2034,7 +2026,19 @@ sub restore_db
my $rv;
my $DBDUMP = shift;
- if ( $OPT_EXTENSIONS ) {
+ # If the dump is NOT extension based
+ # we need to prepare the target
+ if ( $OPT_UPGRADE_FROM =~ /^unpackaged/ || ! $OPT_EXTENSIONS )
+ {
+ if ( $OPT_EXTENSIONS ) {
+ undef($OPT_UPGRADE_FROM); # to directly prepare the target
+ die unless prepare_spatial_extensions();
+ } else {
+ die unless prepare_spatial();
+ }
+ }
+
+ if ( $OPT_EXTENSIONS && ! $OPT_UPGRADE_FROM =~ /^unpackaged/ ) {
print "Restoring database '${DB}' using pg_restore\n";
$rv = system("pg_restore -d ${DB} ${DBDUMP} >> $REGRESS_LOG 2>&1");
} else {
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 6 ------
regress/run_test.pl | 44 ++++++++++++++++++++++++--------------------
utils/postgis_restore.pl.in | 19 +++++++++++++++++++
3 files changed, 43 insertions(+), 26 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list