GiST and SP-GiST n-D indexes (based on GIDX) with overlaps, contains, within, and equals operators

Patch by Esteban Zimányi and Arthur Lesuisse from Université Libre de Bruxelles (ULB)

Closes postgis#327
Closes postgis#293
Closes #4230



git-svn-id: http://svn.osgeo.org/postgis/trunk@17001 b70326c6-7e19-0410-871a-916f4a2858ee

Author: Komzpa

.travis.yml

@@ -9,8 +9,7 @@ env:
   - tag=pg11-geos37-gdal23-proj52
   - tag=pg10-geos36-gdal23-proj49
   - tag=pg96-geos36-gdal22-proj49
-  - tag=pg95-geos36-gdal22-proj49
-  - tag=pg94-geos35-gdal111-proj48
+  - tag=pg95-geos35-gdal111-proj48
 
 matrix:
   allow_failures:

NEWS

@@ -2,33 +2,39 @@ PostGIS 3.0.0
 2019/xx/xx
 * Breaking Changes *
   - #3888, Raster support now available as a separate extension
-    (Sandro Santilli)
+           (Sandro Santilli)
   - #3807, Extension library files no longer include the minor version.
-        Use New configure switch --with-library-minor-version
-        if you need the old behavior (Regina Obe)
+           Use New configure switch --with-library-minor-version
+           if you need the old behavior (Regina Obe)
+  - #4230, ND box operators (overlaps, contains, within, equals) now don't look on
+           dimentions that aren't present in both operands.
+           Please REINDEX your ND indexes after upgrade.
 
 * New Features *
   - #2902, postgis_geos_noop (Sandro Santilli)
   - #4128, ST_AsMVT support for Feature ID (Stepan Kuzmin)
+  - #4230, SP-GiST and GiST support for ND box operators overlaps, contains,
+           within, equals (Esteban Zimányi and Arthur Lesuisse from Université
+           Libre de Bruxelles (ULB), Darafei Praliaskouski)
 
 * Enhancements and fixes *
   - #4153, ST_Segmentize now splits segments proportionally (Darafei
-    Praliaskouski).
+           Praliaskouski).
   - #4162, ST_DWithin documentation examples for storing geometry and
-    radius in table (Darafei Praliaskouski, github user Boscop).
+           radius in table (Darafei Praliaskouski, github user Boscop).
   - #4161, MVT: Drop geometries smaller than the resolution (Raúl Marín)
   - #4176, ST_Intersects supports GEOMETRYCOLLECTION (Darafei Praliaskouski)
   - #4181, St_AsMVTGeom: Avoid type changes due to validation (Raúl Marín)
   - #4183, St_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
-  - #4188, Avoid division by zero in kmeans (Raúl Marín)
+  - #4188, Avoid division by zero in KMeans (Raúl Marín)
   - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
   - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
   - #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
-    Praliaskouski)
+           Praliaskouski)
   - #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
   - #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
   - #4155, Support for GEOMETRYCOLLECTION, POLYGON, TIN, TRIANGLE in
-    ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
+           ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
   - #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
 
 PostGIS 2.5.0
@@ -39,9 +45,9 @@ PostgreSQL 9.4 - PostgreSQL 12 (in development)
 GEOS >= 3.5
 
 * New Features *
-  - #1847, spgist 2d and 3d support for PG 11+
-    (Esteban Zimányi and Arthur Lesuisse from Université Libre de Bruxelles (ULB),
-      Darafei Praliaskouski)
+  - #1847, SP-GiST 2D and 3D support for PostgreSQL 11+ (Esteban Zimányi and
+           Arthur Lesuisse from Université Libre de Bruxelles (ULB), Darafei
+           Praliaskouski)
   - #4056, ST_FilterByM (Nicklas Avén)
   - #4050, ST_ChaikinSmoothing (Nicklas Avén)
   - #3989, ST_Buffer single sided option (Stephen Knox)
@@ -62,7 +68,7 @@ GEOS >= 3.5
 * Breaking Changes *
   - #4054, ST_SimplifyVW changed from > tolerance to >= tolerance
   - #3885, version number removed from address_standardize lib file
-          (Regina Obe)
+           (Regina Obe)
   - #3893, raster support functions can only be loaded in the same schema
            with core PostGIS functions. (Sandro Santilli)
   - #4035, remove dummy pgis_abs type from aggregate/collect routines.

configure.ac

@@ -483,9 +483,9 @@ 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.4
-  if test $POSTGIS_PGSQL_VERSION -lt 94; then
-    AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.4])
+  dnl Ensure that we are using PostgreSQL >= 9.5
+  if test $POSTGIS_PGSQL_VERSION -lt 95; then
+    AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.5])
   fi
 
   HAVE_BRIN=no

libpgcommon/gserialized_gist.h

@@ -26,15 +26,15 @@ typedef struct
 #define GIDX_MAX_SIZE 36
 #define GIDX_MAX_DIM 4
 
-
 /*
  * This macro is based on PG_FREE_IF_COPY, except that it accepts two pointers.
  * See PG_FREE_IF_COPY comment in src/include/fmgr.h in postgres source code
  * for more details.
  */
 #define POSTGIS_FREE_IF_COPY_P(ptrsrc, ptrori) \
-	do { \
-		if ((Pointer) (ptrsrc) != (Pointer) (ptrori)) \
+	do \
+	{ \
+		if ((Pointer)(ptrsrc) != (Pointer)(ptrori)) \
 			pfree(ptrsrc); \
 	} while (0)
 
@@ -51,7 +51,6 @@ typedef struct
 	float xmin, xmax, ymin, ymax;
 } BOX2DF;
 
-
 /*********************************************************************************
 ** GIDX support functions.
 **
@@ -61,7 +60,7 @@ typedef struct
 */
 
 /* allocate a new gidx object on the heap */
-GIDX* gidx_new(int ndims) ;
+GIDX *gidx_new(int ndims);
 
 /* Increase the size of a GIDX */
 void gidx_expand(GIDX *a, float d);
@@ -70,7 +69,7 @@ void gidx_expand(GIDX *a, float d);
 bool gidx_is_unknown(const GIDX *a);
 
 /* Generate human readable form for GIDX. */
-char* gidx_to_string(GIDX *a) ;
+char *gidx_to_string(GIDX *a);
 
 /* typedef to correct array-bounds checking for casts to GIDX - do not
    use this ANYWHERE except in the casts below */
@@ -79,24 +78,24 @@ typedef float _gidx_float_array[sizeof(float) * 2 * 4];
 /* Returns number of dimensions for this GIDX */
 #define GIDX_NDIMS(gidx) ((VARSIZE((gidx)) - VARHDRSZ) / (2 * sizeof(float)))
 /* Minimum accessor. */
-#define GIDX_GET_MIN(gidx, dimension) (*((_gidx_float_array *)(&(gidx)->c)))[2*(dimension)]
+#define GIDX_GET_MIN(gidx, dimension) (*((_gidx_float_array *)(&(gidx)->c)))[2 * (dimension)]
 /* Maximum accessor. */
-#define GIDX_GET_MAX(gidx, dimension) (*((_gidx_float_array *)(&(gidx)->c)))[2*(dimension)+1]
+#define GIDX_GET_MAX(gidx, dimension) (*((_gidx_float_array *)(&(gidx)->c)))[2 * (dimension) + 1]
 /* Minimum setter. */
-#define GIDX_SET_MIN(gidx, dimension, value) ((gidx)->c[2*(dimension)] = (value))
+#define GIDX_SET_MIN(gidx, dimension, value) ((gidx)->c[2 * (dimension)] = (value))
 /* Maximum setter. */
-#define GIDX_SET_MAX(gidx, dimension, value) ((gidx)->c[2*(dimension)+1] = (value))
+#define GIDX_SET_MAX(gidx, dimension, value) ((gidx)->c[2 * (dimension) + 1] = (value))
 /* Returns the size required to store a GIDX of requested dimension */
-#define GIDX_SIZE(dimensions) (sizeof(int32) + 2*(dimensions)*sizeof(float))
+#define GIDX_SIZE(dimensions) (sizeof(int32) + 2 * (dimensions) * sizeof(float))
 
 /* Allocate a copy of the box */
-BOX2DF* box2df_copy(BOX2DF *b);
+BOX2DF *box2df_copy(BOX2DF *b);
 
 /* Grow the first argument to contain the second */
 void box2df_merge(BOX2DF *b_union, BOX2DF *b_new);
 
 /* Allocate a copy of the box */
-GIDX* gidx_copy(GIDX *b);
+GIDX *gidx_copy(GIDX *b);
 
 /* Grow the first argument to contain the second */
 void gidx_merge(GIDX **b_union, GIDX *b_new);
@@ -122,16 +121,14 @@ int gserialized_datum_get_gidx_p(Datum gserialized_datum, GIDX *gidx);
 /* Pull out the gidx bounding box from an already de-toasted geography */
 int gserialized_get_gidx_p(const GSERIALIZED *g, GIDX *gidx);
 /* Copy a new bounding box into an existing gserialized */
-GSERIALIZED* gserialized_set_gidx(GSERIALIZED *g, GIDX *gidx);
+GSERIALIZED *gserialized_set_gidx(GSERIALIZED *g, GIDX *gidx);
 
 /* Given two datums, do they overlap? Computed very fast using embedded boxes. */
 /* int gserialized_datum_overlaps(Datum gs1, Datum gs2); */
 /* Remove the box from a disk serialization */
-GSERIALIZED* gserialized_drop_gidx(GSERIALIZED *g);
+GSERIALIZED *gserialized_drop_gidx(GSERIALIZED *g);
 
 bool box2df_contains(const BOX2DF *a, const BOX2DF *b);
-
-
 void box2df_set_empty(BOX2DF *a);
 void box2df_set_finite(BOX2DF *a);
 void box2df_validate(BOX2DF *b);
@@ -146,7 +143,9 @@ bool box2df_below(const BOX2DF *a, const BOX2DF *b);
 bool box2df_above(const BOX2DF *a, const BOX2DF *b);
 bool box2df_overabove(const BOX2DF *a, const BOX2DF *b);
 
-
+void gidx_validate(GIDX *b);
+void gidx_set_unknown(GIDX *a);
+bool gidx_overlaps(GIDX *a, GIDX *b);
+bool gidx_equals(GIDX *a, GIDX *b);
 bool gidx_contains(GIDX *a, GIDX *b);
 int gserialized_datum_get_box2df_p(Datum gsdatum, BOX2DF *box2df);
-

postgis/Makefile.in

@@ -61,7 +61,7 @@ BRIN_OBJ= brin_2d.o brin_nd.o brin_common.o
 endif
 
 ifeq (@HAVE_SPGIST@,yes)
-SPGIST_OBJ= gserialized_spgist_2d.o gserialized_spgist_3d.o
+SPGIST_OBJ= gserialized_spgist_2d.o gserialized_spgist_3d.o gserialized_spgist_nd.o
 endif
 
 ifeq (@HAVE_PROTOBUF@,yes)