self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-23 16:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate ST_Mem_Size, welcome ST_MemSize

Browse source 
Closes #2769

git-svn-id: http://svn.osgeo.org/postgis/trunk@12629 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Sandro Santilli 2014-06-20 10:12:35 +00:00
parent f8ea325708
commit 77a5d18a7b
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -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, ...)

14
postgis/postgis.sql.in
View file

@ -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

10
regress/lwgeom_regress.sql
View file

@ -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;

5
regress/regress.sql
View file

@ -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)');