[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-560-g366d83f79
git at osgeo.org
git at osgeo.org
Thu Feb 17 14:14:42 PST 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 366d83f797af12c1b193cdb6bda1ff6bb48f9518 (commit)
from 137b70304a1def08e2955abc422810e95e6d798e (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 366d83f797af12c1b193cdb6bda1ff6bb48f9518
Author: Regina Obe <lr at pcorp.us>
Date: Thu Feb 17 16:16:00 2022 -0500
Drop support for PostgreSQL 9.6 and 10
diff --git a/NEWS b/NEWS
index 5a13ae0a7..9b4407b0f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ PostGIS 3.3.0dev
2022/MM/DD
* Breaking changes *
- - ...
+ - Drop support for PostgreSQL 9.6 and 10 (Regina Obe)
* Enhancements *
- postgis_extensions_upgrade() support for upgrades from any PostGIS
diff --git a/configure.ac b/configure.ac
index 1e5bb8337..35b55eb3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,15 +496,12 @@ if test "x$LIBLWGEOM_ONLY" = "xno"; then
PGSQL_SHAREDIR=`"$PG_CONFIG" --sharedir`
AC_MSG_RESULT([checking PostgreSQL version... $PGSQL_FULL_VERSION])
- dnl Ensure that we are using PostgreSQL >= 9.6
- if test $POSTGIS_PGSQL_VERSION -lt 96; then
- AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.6])
+ dnl Ensure that we are using PostgreSQL >= 11
+ if test $POSTGIS_PGSQL_VERSION -lt 110; then
+ AC_MSG_ERROR([PostGIS requires PostgreSQL >= 11])
fi
- HAVE_SPGIST=no
- if test $POSTGIS_PGSQL_VERSION -gt 100; then
- HAVE_SPGIST=yes
- fi
+ HAVE_SPGIST=yes
dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS
diff --git a/doc/postgis.xml b/doc/postgis.xml
index e454e28ff..5399f5819 100644
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -13,7 +13,7 @@
<!-- Change these values to update the version numbers referenced within the documentation -->
<!ENTITY last_proj_release_version "8.2.1">
<!ENTITY last_geos_release_version "3.10.1">
-<!ENTITY min_postgres_version "9.6">
+<!ENTITY min_postgres_version "11">
<!ENTITY introduction SYSTEM "introduction.xml">
<!ENTITY installation SYSTEM "installation.xml">
diff --git a/libpgcommon/lwgeom_pg.c b/libpgcommon/lwgeom_pg.c
index 6243fca78..ce8c05543 100644
--- a/libpgcommon/lwgeom_pg.c
+++ b/libpgcommon/lwgeom_pg.c
@@ -35,9 +35,7 @@
#include "../postgis_config.h"
-#if POSTGIS_PGSQL_VERSION >= 100
#include <utils/regproc.h>
-#endif
#include "liblwgeom.h"
#include "lwgeom_pg.h"
@@ -535,51 +533,6 @@ postgis_guc_find_option(const char *name)
}
-#if POSTGIS_PGSQL_VERSION < 100
-Datum
-CallerFInfoFunctionCall1(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1)
-{
- FunctionCallInfoData fcinfo;
- Datum result;
-
- InitFunctionCallInfoData(fcinfo, flinfo, 1, collation, NULL, NULL);
-
- fcinfo.arg[0] = arg1;
- fcinfo.argnull[0] = false;
-
- result = (*func) (&fcinfo);
-
- /* Check for null result, since caller is clearly not expecting one */
- if (fcinfo.isnull)
- elog(ERROR, "function %p returned NULL", (void *) func);
-
- return result;
-}
-
-Datum
-CallerFInfoFunctionCall2(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2)
-{
- FunctionCallInfoData fcinfo;
- Datum result;
-
- InitFunctionCallInfoData(fcinfo, flinfo, 2, collation, NULL, NULL);
-
- fcinfo.arg[0] = arg1;
- fcinfo.arg[1] = arg2;
- fcinfo.argnull[0] = false;
- fcinfo.argnull[1] = false;
-
- result = (*func) (&fcinfo);
-
- /* Check for null result, since caller is clearly not expecting one */
- if (fcinfo.isnull)
- elog(ERROR, "function %p returned NULL", (void *) func);
-
- return result;
-}
-
-#else
-
#if POSTGIS_PGSQL_VERSION < 120
Datum
CallerFInfoFunctionCall3(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2, Datum arg3)
@@ -630,5 +583,3 @@ CallerFInfoFunctionCall3(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum
return result;
}
#endif
-
-#endif
diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index 49d73b88e..d14937028 100644
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -18,9 +18,7 @@
#include "postgres.h"
#include "fmgr.h"
#include "catalog/namespace.h" /* For TypenameGetTypid */
-#if POSTGIS_PGSQL_VERSION > 100
#include "catalog/pg_type_d.h" /* For TypenameGetTypid */
-#endif
#include "utils/geo_decls.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/postgis/geography.sql.in b/postgis/geography.sql.in
index 4fa9aaa11..5b4e904ab 100644
--- a/postgis/geography.sql.in
+++ b/postgis/geography.sql.in
@@ -296,9 +296,7 @@ CREATE OPERATOR CLASS gist_geography_ops
FUNCTION 1 geography_gist_consistent (internal, geography, int4),
FUNCTION 2 geography_gist_union (bytea, internal),
FUNCTION 3 geography_gist_compress (internal),
-#if POSTGIS_PGSQL_VERSION < 110
FUNCTION 4 geography_gist_decompress (internal),
-#endif
FUNCTION 5 geography_gist_penalty (internal, internal, internal),
FUNCTION 6 geography_gist_picksplit (internal, internal),
FUNCTION 7 geography_gist_same (box2d, box2d, internal);
diff --git a/postgis/lwgeom_box3d.c b/postgis/lwgeom_box3d.c
index 28448f19d..8aec40375 100644
--- a/postgis/lwgeom_box3d.c
+++ b/postgis/lwgeom_box3d.c
@@ -597,7 +597,6 @@ Datum BOX3D_construct(PG_FUNCTION_ARGS)
}
/** needed for sp-gist support PostgreSQL 11+ **/
-#if POSTGIS_PGSQL_VERSION > 100
/*****************************************************************************
* BOX3D functions
*****************************************************************************/
@@ -935,4 +934,3 @@ PGDLLEXPORT Datum BOX3D_distance(PG_FUNCTION_ARGS)
BOX3D *box2 = PG_GETARG_BOX3D_P(1);
PG_RETURN_FLOAT8(BOX3D_distance_internal(box1, box2));
}
-#endif
diff --git a/postgis/lwgeom_box3d.h b/postgis/lwgeom_box3d.h
index bcacb533a..80107977e 100644
--- a/postgis/lwgeom_box3d.h
+++ b/postgis/lwgeom_box3d.h
@@ -64,7 +64,6 @@ bool BOX3D_overback_internal(BOX3D *box1, BOX3D *box2);
double BOX3D_distance_internal(BOX3D *box1, BOX3D *box2);
/** needed for sp-gist support PostgreSQL 11+ **/
-#if POSTGIS_PGSQL_VERSION > 100
Datum BOX3D_contains(PG_FUNCTION_ARGS);
Datum BOX3D_contained(PG_FUNCTION_ARGS);
Datum BOX3D_overlaps(PG_FUNCTION_ARGS);
@@ -82,4 +81,3 @@ Datum BOX3D_overfront(PG_FUNCTION_ARGS);
Datum BOX3D_back(PG_FUNCTION_ARGS);
Datum BOX3D_overback(PG_FUNCTION_ARGS);
Datum BOX3D_distance(PG_FUNCTION_ARGS);
-#endif
diff --git a/postgis/mvt.c b/postgis/mvt.c
index f128e6c21..4f5f9e87a 100644
--- a/postgis/mvt.c
+++ b/postgis/mvt.c
@@ -36,11 +36,6 @@
#include "lwgeom_wagyu.h"
-#if POSTGIS_PGSQL_VERSION < 110
-/* See trac ticket #3867 */
-# define DatumGetJsonbP DatumGetJsonb
-#endif
-
#define uthash_fatal(msg) lwerror("uthash: fatal error (out of memory)")
#define uthash_malloc(sz) palloc(sz)
#define uthash_free(ptr,sz) pfree(ptr)
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 786473078..86ba08bca 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -844,9 +844,7 @@ CREATE OPERATOR CLASS gist_geometry_ops_2d
FUNCTION 1 geometry_gist_consistent_2d (internal, geometry, int4),
FUNCTION 2 geometry_gist_union_2d (bytea, internal),
FUNCTION 3 geometry_gist_compress_2d (internal),
-#if POSTGIS_PGSQL_VERSION < 110
FUNCTION 4 geometry_gist_decompress_2d (internal),
-#endif
FUNCTION 5 geometry_gist_penalty_2d (internal, internal, internal),
FUNCTION 6 geometry_gist_picksplit_2d (internal, internal),
FUNCTION 7 geometry_gist_same_2d (geom1 geometry, geom2 geometry, internal);
@@ -1031,9 +1029,8 @@ CREATE OPERATOR CLASS gist_geometry_ops_nd
FUNCTION 1 geometry_gist_consistent_nd (internal, geometry, int4),
FUNCTION 2 geometry_gist_union_nd (bytea, internal),
FUNCTION 3 geometry_gist_compress_nd (internal),
-#if POSTGIS_PGSQL_VERSION < 110
+ -- Changed: 3.3.0
FUNCTION 4 geometry_gist_decompress_nd (internal),
-#endif
FUNCTION 5 geometry_gist_penalty_nd (internal, internal, internal),
FUNCTION 6 geometry_gist_picksplit_nd (internal, internal),
FUNCTION 7 geometry_gist_same_nd (geometry, geometry, internal);
@@ -4966,10 +4963,8 @@ CREATE AGGREGATE ST_AsMVT(anyelement)
serialfunc = pgis_asmvt_serialfn,
deserialfunc = pgis_asmvt_deserialfn,
combinefunc = pgis_asmvt_combinefn,
- finalfunc = pgis_asmvt_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asmvt_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 2.4.0
@@ -4983,12 +4978,11 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text)
deserialfunc = pgis_asmvt_deserialfn,
combinefunc = pgis_asmvt_combinefn,
finalfunc = pgis_asmvt_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
,finalfunc_modify = read_write
-#endif
);
-- Availability: 2.4.0
+-- Changed: 3.3.0
-- Changed: 3.2.0
CREATE AGGREGATE ST_AsMVT(anyelement, text, int4)
(
@@ -4998,13 +4992,12 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4)
serialfunc = pgis_asmvt_serialfn,
deserialfunc = pgis_asmvt_deserialfn,
combinefunc = pgis_asmvt_combinefn,
- finalfunc = pgis_asmvt_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asmvt_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 2.4.0
+-- Changed: 3.3.0
-- Changed: 3.2.0
CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text)
(
@@ -5014,13 +5007,12 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text)
serialfunc = pgis_asmvt_serialfn,
deserialfunc = pgis_asmvt_deserialfn,
combinefunc = pgis_asmvt_combinefn,
- finalfunc = pgis_asmvt_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asmvt_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 3.0.0
+-- Changed: 3.3.0
-- Changed: 3.2.0
CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text, text)
(
@@ -5030,10 +5022,8 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text, text)
serialfunc = pgis_asmvt_serialfn,
deserialfunc = pgis_asmvt_deserialfn,
combinefunc = pgis_asmvt_combinefn,
- finalfunc = pgis_asmvt_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asmvt_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 2.4.0
@@ -5127,27 +5117,25 @@ CREATE OR REPLACE FUNCTION pgis_asflatgeobuf_finalfn(internal)
_COST_MEDIUM;
-- Availability: 3.2.0
+-- Changed: 3.3.0
CREATE AGGREGATE ST_AsFlatGeobuf(anyelement)
(
sfunc = pgis_asflatgeobuf_transfn,
stype = internal,
parallel = safe,
- finalfunc = pgis_asflatgeobuf_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asflatgeobuf_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 3.2.0
+-- Changed: 3.3.0
CREATE AGGREGATE ST_AsFlatGeobuf(anyelement, bool)
(
sfunc = pgis_asflatgeobuf_transfn,
stype = internal,
parallel = safe,
- finalfunc = pgis_asflatgeobuf_finalfn
-#if POSTGIS_PGSQL_VERSION >= 110
- ,finalfunc_modify = read_write
-#endif
+ finalfunc = pgis_asflatgeobuf_finalfn,
+ finalfunc_modify = read_write
);
-- Availability: 3.2.0
diff --git a/postgis/postgis_spgist.sql.in b/postgis/postgis_spgist.sql.in
index 706650ef1..060f54744 100644
--- a/postgis/postgis_spgist.sql.in
+++ b/postgis/postgis_spgist.sql.in
@@ -1,5 +1,4 @@
#include "sqldefines.h"
-#if POSTGIS_PGSQL_VERSION > 100
-- ---------- ---------- ---------- ---------- ---------- ---------- ----------
-- SP-GiST 2D Support Functions
-- ---------- ---------- ---------- ---------- ---------- ---------- ----------
@@ -265,5 +264,3 @@ CREATE OPERATOR CLASS spgist_geography_ops_nd
FUNCTION 4 geography_spgist_inner_consistent_nd(internal, internal),
FUNCTION 5 geography_spgist_leaf_consistent_nd(internal, internal),
FUNCTION 6 geography_spgist_compress_nd(internal);
-
-#endif
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
configure.ac | 11 ++++------
doc/postgis.xml | 2 +-
libpgcommon/lwgeom_pg.c | 49 -------------------------------------------
libpgcommon/lwgeom_pg.h | 2 --
postgis/geography.sql.in | 2 --
postgis/lwgeom_box3d.c | 2 --
postgis/lwgeom_box3d.h | 2 --
postgis/mvt.c | 5 -----
postgis/postgis.sql.in | 48 ++++++++++++++++--------------------------
postgis/postgis_spgist.sql.in | 3 ---
11 files changed, 24 insertions(+), 104 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list