Merge pull requestfrom Mohit242-bit/fix/separateTouching-performance

Fix #3010: Optimize pgr_separateTouching performance

Author: cvvergara

NEWS.md

@@ -37,6 +37,7 @@ To see all issues & pull requests closed by this release see the
 
 * [#2966](https://github.com/pgRouting/pgrouting/issues/2966): pgr_withPoints does not pick optimal route when fraction = 1
 * [#3034](https://github.com/pgRouting/pgrouting/issues/3034): metrics driver should not be using new
+* [#3010](https://github.com/pgRouting/pgrouting/issues/3010): Performance issue with pgr_separateTouching()
 
 **Code enhancements**
 

doc/src/release_notes.rst

@@ -67,6 +67,7 @@ To see all issues & pull requests closed by this release see the
 
 * :issue:`2966`: pgr_withPoints does not pick optimal route when fraction = 1
 * :issue:`3034`: metrics driver should not be using new
+* :issue:`3010`: Performance issue with pgr_separateTouching()
 
 .. rubric:: Code enhancements
 

docqueries/utilities/separateTouching.result

@@ -22,24 +22,28 @@ FROM pgr_separateTouching('SELECT id, geom FROM edges', dryrun => true);
 NOTICE:
     WITH
     edges_table AS (
-      SELECT id, geom FROM edges
+      SELECT id, geom,
+             ST_StartPoint(geom) AS startpoint,
+             ST_EndPoint(geom) AS endpoint
+      FROM (SELECT id, geom FROM edges) _edges
     ),
 
     get_touching AS (
-      SELECT e1.id id1, e2.id id2, ST_Snap(e1.geom, e2.geom, 0.01) AS geom, e1.geom AS g1, e2.geom AS g2
+      SELECT e1.id id1, e2.id id2, ST_Snap(e1.geom, e2.geom, 0.01) AS geom, e1.geom AS g1, e2.geom AS g2,
+             e1.startpoint AS sp1, e1.endpoint AS ep1
       FROM edges_table e1, edges_table e2
       WHERE e1.id != e2.id AND ST_DWithin(e1.geom, e2.geom, 0.01) AND NOT(
-        ST_StartPoint(e1.geom) = ST_StartPoint(e2.geom) OR ST_StartPoint(e1.geom) = ST_EndPoint(e2.geom)
-        OR ST_EndPoint(e1.geom) = ST_StartPoint(e2.geom) OR ST_EndPoint(e1.geom) = ST_EndPoint(e2.geom))
+        e1.startpoint = e2.startpoint OR e1.startpoint = e2.endpoint
+        OR e1.endpoint = e2.startpoint OR e1.endpoint = e2.endpoint)
     ),
 
     touchings AS (
       SELECT  id1, g1, g2, st_intersection(geom, g2) AS point
       FROM get_touching
       WHERE  NOT (geom = g1) OR
          (ST_touches(g1, g2) AND NOT
-            (ST_Intersection(geom, g2) = ST_StartPoint(g1)
-             OR ST_Intersection(geom, g2) = ST_EndPoint(g1)))
+            (ST_Intersection(geom, g2) = sp1
+             OR ST_Intersection(geom, g2) = ep1))
     ),
 
     blades AS (

locale/en/LC_MESSAGES/pgrouting_doc_strings.po

@@ -15069,6 +15069,11 @@ msgid ""
 "driver should not be using new"
 msgstr ""
 
+msgid ""
+"`#3010 <https://github.com/pgRouting/pgrouting/issues/3010>`__: Performance "
+"issue with pgr_separateTouching()"
+msgstr ""
+
 msgid ""
 "`#3044 <https://github.com/pgRouting/pgrouting/issues/3044>`__: Check and "
 "fix assert.hpp for cppcoreguidelines-explicit-virtual-functions"

locale/pot/pgrouting_doc_strings.pot

@@ -12721,6 +12721,9 @@ msgstr ""
 msgid "`#3034 <https://github.com/pgRouting/pgrouting/issues/3034>`__: metrics driver should not be using new"
 msgstr ""
 
+msgid "`#3010 <https://github.com/pgRouting/pgrouting/issues/3010>`__: Performance issue with pgr_separateTouching()"
+msgstr ""
+
 msgid "`#3044 <https://github.com/pgRouting/pgrouting/issues/3044>`__: Check and fix assert.hpp for cppcoreguidelines-explicit-virtual-functions"
 msgstr ""
 

sql/utilities/separateTouching.sql

@@ -59,24 +59,28 @@ BEGIN
   the_query := format($$
     WITH
     edges_table AS (
-      %s
+      SELECT id, geom,
+             ST_StartPoint(geom) AS startpoint,
+             ST_EndPoint(geom) AS endpoint
+      FROM (%s) _edges
     ),
 
     get_touching AS (
-      SELECT e1.id id1, e2.id id2, ST_Snap(e1.geom, e2.geom, %2$s) AS geom, e1.geom AS g1, e2.geom AS g2
+      SELECT e1.id id1, e2.id id2, ST_Snap(e1.geom, e2.geom, %2$s) AS geom, e1.geom AS g1, e2.geom AS g2,
+             e1.startpoint AS sp1, e1.endpoint AS ep1
       FROM edges_table e1, edges_table e2
       WHERE e1.id != e2.id AND ST_DWithin(e1.geom, e2.geom, %2$s) AND NOT(
-        ST_StartPoint(e1.geom) = ST_StartPoint(e2.geom) OR ST_StartPoint(e1.geom) = ST_EndPoint(e2.geom)
-        OR ST_EndPoint(e1.geom) = ST_StartPoint(e2.geom) OR ST_EndPoint(e1.geom) = ST_EndPoint(e2.geom))
+        e1.startpoint = e2.startpoint OR e1.startpoint = e2.endpoint
+        OR e1.endpoint = e2.startpoint OR e1.endpoint = e2.endpoint)
     ),
 
     touchings AS (
       SELECT  id1, g1, g2, st_intersection(geom, g2) AS point
       FROM get_touching
       WHERE  NOT (geom = g1) OR
          (ST_touches(g1, g2) AND NOT
-            (ST_Intersection(geom, g2) = ST_StartPoint(g1)
-             OR ST_Intersection(geom, g2) = ST_EndPoint(g1)))
+            (ST_Intersection(geom, g2) = sp1
+             OR ST_Intersection(geom, g2) = ep1))
     ),
 
     blades AS (