Change new cache behavior to require > 9.6 instead of > 9.5, the AllocSetContextCreat...

Closes #3950

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

diff --git a/extensions/address_standardizer/std_pg_hash.c b/extensions/address_standardizer/std_pg_hash.c
index ffd55d2f38c745f8c9db8378a62b925a1667ef2c..082d52ae71da6cd86182739bf99af1293f044ed8 100644 (file)
--- a/extensions/address_standardizer/std_pg_hash.c
+++ b/extensions/address_standardizer/std_pg_hash.c
@@ -113,7 +113,7 @@ static int load_rules(RULES *rules, char *tabname);
 
 
 static void
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 
 StdCacheDelete(MemoryContext context)
 {
@@ -140,7 +140,7 @@ StdCacheDelete(void *ptr)
     DeleteStdHashEntry(context);
 }
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 
 static void
 StdCacheInit(MemoryContext context)
@@ -194,7 +194,7 @@ static MemoryContextMethods StdCacheContextMethods =
 #endif
 };
 
-#endif /* POSTGIS_PGSQL_VERSION < 95 */
+#endif /* POSTGIS_PGSQL_VERSION < 96 */
 
 
 uint32
@@ -383,7 +383,7 @@ AddToStdPortalCache(StdPortalCache *STDCache, char *lextab, char *gaztab, char *
     DBG("Adding item to STD cache ('%s', '%s', '%s') index %d", lextab, gaztab, rultab, STDCache->NextSlot);
 
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
     STDMemoryContext = MemoryContextCreate(T_AllocSetContext, 8192,
                                            &StdCacheContextMethods,
                                            STDCache->StdCacheContext,

diff --git a/libpgcommon/lwgeom_transform.c b/libpgcommon/lwgeom_transform.c
index 1993326f0348bc02ee327de6fe67f9aa0fa86eaf..8d9768eaa2cc64d009ad0249e1826469e206b02f 100644 (file)
--- a/libpgcommon/lwgeom_transform.c
+++ b/libpgcommon/lwgeom_transform.c
@@ -89,7 +89,7 @@ void SetPROJ4LibPath(void);
 
 
 static void
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 PROJ4SRSCacheDelete(MemoryContext context)
 {
 #else
@@ -113,7 +113,7 @@ PROJ4SRSCacheDelete(void *ptr)
        DeletePJHashEntry(context);
 }
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 
 static void
 PROJ4SRSCacheInit(MemoryContext context)
@@ -182,7 +182,7 @@ static MemoryContextMethods PROJ4SRSCacheContextMethods =
 #endif
 };
 
-#endif /* POSTGIS_PGSQL_VERSION < 95 */
+#endif /* POSTGIS_PGSQL_VERSION < 96 */
 
 /*
  * PROJ4 projPJ Hash Table functions
@@ -534,7 +534,7 @@ AddToPROJ4SRSCache(PROJ4PortalCache *PROJ4Cache, int srid, int other_srid)
         */
        POSTGIS_DEBUGF(3, "adding SRID %d with proj4text \"%s\" to query cache at index %d", srid, proj_str, PROJ4Cache->PROJ4SRSCacheCount);
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
        PJMemoryContext = MemoryContextCreate(T_AllocSetContext, 8192,
                                              &PROJ4SRSCacheContextMethods,
                                              PROJ4Cache->PROJ4SRSCacheContext,

diff --git a/postgis/lwgeom_geos_prepared.c b/postgis/lwgeom_geos_prepared.c
index 50e85636b1ea03818ea8e7e291ffbd7c61c3c1af..ea453e1fa01f50f6c4d2783c5e00bb1a7fb788e6 100644 (file)
--- a/postgis/lwgeom_geos_prepared.c
+++ b/postgis/lwgeom_geos_prepared.c
@@ -96,7 +96,7 @@ static void DeletePrepGeomHashEntry(MemoryContext mcxt);
 
 
 static void
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 PreparedCacheDelete(MemoryContext context)
 {
 #else
@@ -125,7 +125,7 @@ PreparedCacheDelete(void *ptr)
        DeletePrepGeomHashEntry(context);
 }
 
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
 static void
 PreparedCacheInit(MemoryContext context)
 {
@@ -192,7 +192,7 @@ static MemoryContextMethods PreparedCacheContextMethods =
 #endif
 };
 
-#endif /* POSTGIS_PGSQL_VERSION < 95 */
+#endif /* POSTGIS_PGSQL_VERSION < 96 */
 
 
 
@@ -313,7 +313,7 @@ PrepGeomCacheBuilder(const LWGEOM *lwgeom, GeomCache *cache)
        if ( ! prepcache->context_callback )
        {
                PrepGeomHashEntry pghe;
-#if POSTGIS_PGSQL_VERSION < 95
+#if POSTGIS_PGSQL_VERSION < 96
                prepcache->context_callback = MemoryContextCreate(T_AllocSetContext, 8192,
                                             &PreparedCacheContextMethods,
                                             prepcache->context_statement,