From: Sandro Santilli <strk@keybit.net>
Date: Mon, 3 Dec 2012 10:09:54 +0000 (+0000)
Subject: Make ST_RemEdge* tests 30% faster by reducing service costs
X-Git-Tag: 2.1.0beta2~331
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a222413d714c681eda0d11c8fc9d4290d85ee2a;p=postgis

Make ST_RemEdge* tests 30% faster by reducing service costs

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

diff --git a/topology/test/regress/st_remedgemodface.sql b/topology/test/regress/st_remedgemodface.sql
index d5e9a646c..37b064d21 100644
--- a/topology/test/regress/st_remedgemodface.sql
+++ b/topology/test/regress/st_remedgemodface.sql
@@ -9,17 +9,16 @@ INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( '
 
 -- Utility functions for the test {
 
+CREATE TEMP TABLE orig_node_summary(node_id integer, containing_face integer);
 CREATE OR REPLACE FUNCTION save_nodes()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_node_summary;
-  CREATE TABLE city_data.orig_node_summary
-  AS SELECT node_id,
+  TRUNCATE TABLE orig_node_summary;
+  INSERT INTO orig_node_summary
+  SELECT node_id,
     containing_face
     FROM city_data.node;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
 
 CREATE OR REPLACE FUNCTION check_nodes(lbl text)
 RETURNS TABLE (l text, o text, node_id int,
@@ -34,7 +33,7 @@ BEGIN
       containing_face 
   		FROM city_data.node';
   sql2 := 'node_id, containing_face
-  		FROM city_data.orig_node_summary';
+  		FROM orig_node_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||
@@ -53,17 +52,16 @@ BEGIN
 END
 $$ LANGUAGE 'plpgsql';
 
+CREATE TEMP TABLE orig_edge_summary (edge_id integer, next_left_edge integer, next_right_edge integer, left_face integer, right_face integer);
 CREATE OR REPLACE FUNCTION save_edges()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_edge_summary;
-  CREATE TABLE city_data.orig_edge_summary AS
+  TRUNCATE orig_edge_summary;
+  INSERT INTO orig_edge_summary 
   SELECT edge_id,
     next_left_edge, next_right_edge, left_face, right_face
     FROM city_data.edge_data;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
 
 CREATE OR REPLACE FUNCTION check_edges(lbl text)
 RETURNS TABLE (l text, o text, edge_id int,
@@ -81,7 +79,7 @@ BEGIN
   		FROM city_data.edge_data';
   sql2 := 'edge_id,
   		next_left_edge, next_right_edge, left_face, right_face
-  		FROM city_data.orig_edge_summary';
+  		FROM orig_edge_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||
@@ -100,16 +98,15 @@ BEGIN
 END
 $$ LANGUAGE 'plpgsql';
 
+CREATE TEMP TABLE orig_face_summary(face_id integer, mbr geometry);
 CREATE OR REPLACE FUNCTION save_faces()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_face_summary;
-  CREATE TABLE city_data.orig_face_summary AS
+  TRUNCATE orig_face_summary;
+  INSERT INTO orig_face_summary 
   SELECT face_id, mbr
     FROM city_data.face;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
 
 CREATE OR REPLACE FUNCTION check_faces(lbl text)
 RETURNS TABLE (l text, o text, face_id int, mbr text)
@@ -120,7 +117,7 @@ DECLARE
   q text;
 BEGIN
   sql1 := 'face_id, ST_AsEWKT(mbr) FROM city_data.face';
-  sql2 := 'face_id, ST_AsEWKT(mbr) FROM city_data.orig_face_summary';
+  sql2 := 'face_id, ST_AsEWKT(mbr) FROM orig_face_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||
diff --git a/topology/test/regress/st_remedgenewface.sql b/topology/test/regress/st_remedgenewface.sql
index 10e8ca044..a55c90557 100644
--- a/topology/test/regress/st_remedgenewface.sql
+++ b/topology/test/regress/st_remedgenewface.sql
@@ -9,17 +9,17 @@ INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( '
 
 -- Utility functions for the test {
 
+CREATE TEMP TABLE orig_node_summary(node_id integer, containing_face integer);
 CREATE OR REPLACE FUNCTION save_nodes()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_node_summary;
-  CREATE TABLE city_data.orig_node_summary
-  AS SELECT node_id,
+  TRUNCATE TABLE orig_node_summary;
+  INSERT INTO orig_node_summary
+  SELECT node_id,
     containing_face
     FROM city_data.node;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
+
 
 CREATE OR REPLACE FUNCTION check_nodes(lbl text)
 RETURNS TABLE (l text, o text, node_id int,
@@ -34,7 +34,7 @@ BEGIN
       containing_face 
   		FROM city_data.node';
   sql2 := 'node_id, containing_face
-  		FROM city_data.orig_node_summary';
+  		FROM orig_node_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||
@@ -53,17 +53,16 @@ BEGIN
 END
 $$ LANGUAGE 'plpgsql';
 
+CREATE TEMP TABLE orig_edge_summary (edge_id integer, next_left_edge integer, next_right_edge integer, left_face integer, right_face integer);
 CREATE OR REPLACE FUNCTION save_edges()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_edge_summary;
-  CREATE TABLE city_data.orig_edge_summary AS
+  TRUNCATE orig_edge_summary;
+  INSERT INTO orig_edge_summary 
   SELECT edge_id,
     next_left_edge, next_right_edge, left_face, right_face
     FROM city_data.edge_data;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
 
 CREATE OR REPLACE FUNCTION check_edges(lbl text)
 RETURNS TABLE (l text, o text, edge_id int,
@@ -81,7 +80,7 @@ BEGIN
   		FROM city_data.edge_data';
   sql2 := 'edge_id,
   		next_left_edge, next_right_edge, left_face, right_face
-  		FROM city_data.orig_edge_summary';
+  		FROM orig_edge_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||
@@ -100,16 +99,15 @@ BEGIN
 END
 $$ LANGUAGE 'plpgsql';
 
+CREATE TEMP TABLE orig_face_summary(face_id integer, mbr geometry);
 CREATE OR REPLACE FUNCTION save_faces()
 RETURNS VOID
 AS $$
-BEGIN
-  DROP TABLE IF EXISTS city_data.orig_face_summary;
-  CREATE TABLE city_data.orig_face_summary AS
+  TRUNCATE orig_face_summary;
+  INSERT INTO orig_face_summary 
   SELECT face_id, mbr
     FROM city_data.face;
-END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'sql';
 
 CREATE OR REPLACE FUNCTION check_faces(lbl text)
 RETURNS TABLE (l text, o text, face_id int, mbr text)
@@ -120,7 +118,7 @@ DECLARE
   q text;
 BEGIN
   sql1 := 'face_id, ST_AsEWKT(mbr) FROM city_data.face';
-  sql2 := 'face_id, ST_AsEWKT(mbr) FROM city_data.orig_face_summary';
+  sql2 := 'face_id, ST_AsEWKT(mbr) FROM orig_face_summary';
 
   q := '(' ||
           'SELECT ' || quote_literal(lbl) || ',''+'' as op,' || sql1 ||