Deprecate ST_Mem_Size, welcome ST_MemSize

Closes #2769

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

diff --git a/NEWS b/NEWS
index 7a438085629968b603f70b3329bcf71f581c8cc4..302a27428c77d9f57b3d958f1883b2fec9dd8e8f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PostGIS 2.2.0
 
  * Deprecated signatures *
 
+  - #2769, ST_Mem_Size renamed to ST_MemSize
   - #2565, ST_SummaryStats(tablename, rastercolumn, ...)
   - #2567, ST_Count(tablename, rastercolumn, ...)
 

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 97832734cba10b447702cb7f54d17846dbe99e40..6e256e46667522f984f05ad5d3f577000a7ac0e5 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -1066,12 +1066,22 @@ CREATE OR REPLACE FUNCTION postgis_hasbbox(geometry)
 ------------------------------------------------------------------------
 -- DEBUG
 ------------------------------------------------------------------------
--- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_mem_size(geometry)
+
+-- Availability: 2.2.0
+CREATE OR REPLACE FUNCTION ST_MemSize(geometry)
        RETURNS int4
        AS 'MODULE_PATHNAME', 'LWGEOM_mem_size'
        LANGUAGE 'c' IMMUTABLE STRICT;
 
+-- Availability: 1.2.2
+-- Deprecation in 2.2.0
+CREATE OR REPLACE FUNCTION ST_mem_size(geometry)
+       RETURNS int4 AS
+  $$ SELECT _postgis_deprecate('ST_Mem_Size', 'ST_MemSize', '2.2.0');
+    SELECT ST_MemSize($1);
+  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT SECURITY INVOKER;
+
 -- Availability: 1.2.2
 CREATE OR REPLACE FUNCTION ST_summary(geometry)
        RETURNS text

diff --git a/regress/lwgeom_regress.sql b/regress/lwgeom_regress.sql
index f0335a037d7ee5762e1e602b88406f412ea09d70..cd39be5aa2bc5046750ce183a730f385fe6f45e9 100644 (file)
--- a/regress/lwgeom_regress.sql
+++ b/regress/lwgeom_regress.sql
@@ -94,10 +94,10 @@ SELECT id,wkt FROM test_data WHERE
 
 SELECT ST_extent(geometry(wkb_ndr)) from test_data;
 SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data WHERE ST_NDims(wkb_ndr) > 2;
-SELECT ST_mem_size(ST_collect(ST_Force2d(geometry(wkb_ndr)))) from test_data;
-SELECT ST_mem_size(ST_collect(ST_Force3dz(geometry(wkb_ndr)))) from test_data;
-SELECT ST_mem_size(ST_collect(ST_Force4d(ST_force2d(geometry(wkb_ndr))))) from test_data;
-SELECT ST_mem_size(ST_collect(ST_Force3dm(geometry(wkb_ndr)))) from test_data;
-SELECT ST_mem_size(ST_collect(ST_Force2d(ST_force4d(ST_force3dm(ST_force3dz(ST_force2d(geometry(wkb_ndr)))))))) from test_data;
+SELECT ST_MemSize(ST_collect(ST_Force2d(geometry(wkb_ndr)))) from test_data;
+SELECT ST_MemSize(ST_collect(ST_Force3dz(geometry(wkb_ndr)))) from test_data;
+SELECT ST_MemSize(ST_collect(ST_Force4d(ST_force2d(geometry(wkb_ndr))))) from test_data;
+SELECT ST_MemSize(ST_collect(ST_Force3dm(geometry(wkb_ndr)))) from test_data;
+SELECT ST_MemSize(ST_collect(ST_Force2d(ST_force4d(ST_force3dm(ST_force3dz(ST_force2d(geometry(wkb_ndr)))))))) from test_data;
 
 DROP TABLE test_data;

diff --git a/regress/regress.sql b/regress/regress.sql
index ba3a9f277d18091236e790e02edb5fa6c82df679..43dbceec3b15db63bc0fe8806bc556ec38a8348c 100644 (file)
--- a/regress/regress.sql
+++ b/regress/regress.sql
@@ -186,7 +186,7 @@ select '109',ST_NPoints('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3
 
 select '110', ST_NRings('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) ) ,( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7, 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1) ) )'::GEOMETRY) as value;
 
-select '111', ST_mem_size(PostGIS_DropBBOX('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) ) ,( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7, 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1) ) )'::GEOMETRY)) as value;
+select '111', ST_MemSize(PostGIS_DropBBOX('MULTIPOLYGON( ((0 0, 10 0, 10 10, 0 10, 0 0)),( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7, 5 5) ) ,( (0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 7 5, 7 7, 5 7, 5 5),(1 1,2 1, 2 2, 1 2, 1 1) ) )'::GEOMETRY)) as value;
 
 select '112',ST_NumGeometries('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3),MULTIPOINT(1 1, 2 2))'::GEOMETRY) as value;
 
@@ -214,6 +214,9 @@ select '126',a ~= b from TEST;
 select '127',a @ b from TEST;
 select '128',a ~ b from TEST; 
 
+-- ST_Mem_Size was deprecated in favor of ST_MemSize in 2.2.0
+-- We keep the test using the deprecated function until 2.4.0 
+-- (when the function will be removed)
 select '129', ST_mem_size(PostGIS_DropBBOX(a)), ST_mem_size(PostGIS_DropBBOX(b)) from TEST;
 
 select '131', ST_X('POINT(1 2)');