Skip to content

Issue 2770 improve internal functions #2771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cvvergara merged 3 commits into from
Feb 27, 2025
Merged

Issue 2770 improve internal functions #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
373dd66
(internal SQL) Throw PostgreSQL errmsg, hint and error code
cvvergara Feb 20, 2025
695af1e
Work on rabbit suggestions
cvvergara Feb 27, 2025
8f010b2
Update locale: commit 695af1e09
github-actions[bot] Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,19 @@

### pgRouting 3.8.0 Release Notes

No Changes Yet
**Changes on proposed functions**

* pgr_extractVertices

* Error messages adjustment.

* pgr_findCloseEdges

* Error messages adjustment.

* pgr_degree

* Error messages adjustment.

## pgRouting 3.7

Expand Down
20 changes: 19 additions & 1 deletion doc/src/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,25 @@ pgRouting 3.8
pgRouting 3.8.0 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
.. rubric:: Changes on proposed functions

* pgr_extractVertices

.. include:: pgr_extractVertices.rst
:start-after: Version 3.8.0
:end-before: .. rubric

* pgr_findCloseEdges

.. include:: pgr_findCloseEdges.rst
:start-after: Version 3.8.0
:end-before: .. rubric

* pgr_degree

.. include:: pgr_degree.rst
:start-after: Version 3.8.0
:end-before: .. rubric

pgRouting 3.7
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Expand Down
8 changes: 6 additions & 2 deletions doc/topology/pgr_degree.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@

.. rubric:: Availability

* Version 3.4.0
.. rubric:: Version 3.8.0

* New proposed function.
* Error messages adjustment.

.. rubric:: Version 3.4.0

* New proposed function.


Description
Expand Down
12 changes: 8 additions & 4 deletions doc/topology/pgr_extractVertices.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@

.. rubric:: Availability

* Version 3.3.0
.. rubric:: Version 3.8.0

* Classified as **proposed** function
* Error messages adjustment.

* Version 3.0.0
.. rubric:: Version 3.3.0

* New experimental function.
* Function promoted to proposed.

.. rubric:: Version 3.0.0

* New experimental function.


Description
Expand Down
8 changes: 6 additions & 2 deletions doc/utilities/pgr_findCloseEdges.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@

.. rubric:: Availability

* Version 3.4.0
.. rubric:: Version 3.8.0

* New proposed function.
* Error messages adjustment.

.. rubric:: Version 3.4.0

* New proposed function.

Description
-------------------------------------------------------------------------------
Expand Down
28 changes: 17 additions & 11 deletions locale/en/LC_MESSAGES/pgrouting_doc_strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.8\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-27 18:35+0000\n"
"POT-Creation-Date: 2025-02-27 23:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -4404,7 +4404,19 @@ msgstr ""
msgid "pgRouting 3.8.0 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgid "Changes on proposed functions"
msgstr ""

msgid "pgr_extractVertices"
msgstr ""

msgid "Error messages adjustment."
msgstr ""

msgid "pgr_findCloseEdges"
msgstr ""

msgid "pgr_degree"
msgstr ""

msgid "All releases"
Expand Down Expand Up @@ -10200,6 +10212,9 @@ msgid ""
" of edges incident to the vertex."
msgstr ""

msgid "Version 3.8.0"
msgstr ""

msgid "Calculates the degree of the vertices of an **undirected** graph"
msgstr ""

Expand Down Expand Up @@ -11451,9 +11466,6 @@ msgstr ""
msgid "``pgr_extractVertices`` — Extracts the vertices information"
msgstr ""

msgid "Classified as **proposed** function"
msgstr ""

msgid ""
"This is an auxiliary function for extracting the vertex information of "
"the set of edges of a graph."
Expand Down Expand Up @@ -15761,9 +15773,6 @@ msgstr ""
msgid "Changes on the documentation to the following:"
msgstr ""

msgid "pgr_degree"
msgstr ""

msgid "pgr_dijkstra"
msgstr ""

Expand Down Expand Up @@ -16155,9 +16164,6 @@ msgstr ""
msgid "pgr_sequentialVertexColoring"
msgstr ""

msgid "pgr_extractVertices"
msgstr ""

msgid "Traversal"
msgstr ""

Expand Down
28 changes: 17 additions & 11 deletions locale/pot/pgrouting_doc_strings.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.8\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-27 18:35+0000\n"
"POT-Creation-Date: 2025-02-27 23:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -3928,7 +3928,19 @@ msgstr ""
msgid "pgRouting 3.8.0 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgid "Changes on proposed functions"
msgstr ""

msgid "pgr_extractVertices"
msgstr ""

msgid "Error messages adjustment."
msgstr ""

msgid "pgr_findCloseEdges"
msgstr ""

msgid "pgr_degree"
msgstr ""

msgid "All releases"
Expand Down Expand Up @@ -8713,6 +8725,9 @@ msgstr ""
msgid "``pgr_degree`` — For each vertex in an undirected graph, return the count of edges incident to the vertex."
msgstr ""

msgid "Version 3.8.0"
msgstr ""

msgid "Calculates the degree of the vertices of an **undirected** graph"
msgstr ""

Expand Down Expand Up @@ -9745,9 +9760,6 @@ msgstr ""
msgid "``pgr_extractVertices`` — Extracts the vertices information"
msgstr ""

msgid "Classified as **proposed** function"
msgstr ""

msgid "This is an auxiliary function for extracting the vertex information of the set of edges of a graph."
msgstr ""

Expand Down Expand Up @@ -13201,9 +13213,6 @@ msgstr ""
msgid "Changes on the documentation to the following:"
msgstr ""

msgid "pgr_degree"
msgstr ""

msgid "pgr_dijkstra"
msgstr ""

Expand Down Expand Up @@ -13516,9 +13525,6 @@ msgstr ""
msgid "pgr_sequentialVertexColoring"
msgstr ""

msgid "pgr_extractVertices"
msgstr ""

msgid "Traversal"
msgstr ""

Expand Down
33 changes: 26 additions & 7 deletions pgtap/topology/degree/edge_cases.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
BEGIN;

UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
SELECT CASE WHEN min_version('3.4.0') THEN plan(12) ELSE plan(1) END;
SELECT CASE WHEN min_version('3.4.0') THEN plan(16) ELSE plan(1) END;


CREATE OR REPLACE FUNCTION edge_cases()
Expand Down Expand Up @@ -59,11 +59,13 @@ BEGIN
SELECT * FROM pgr_degree('edges','SELECT id, out_edges FROM vertices');

RETURN QUERY SELECT lives_ok('query_1', 'Good execution');
RETURN QUERY SELECT throws_ok('query_2', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT throws_ok('query_3', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT throws_ok('query_4', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT column_missing('query_2', 'id');
RETURN QUERY SELECT column_missing('query_3', 'in_edges');
RETURN QUERY SELECT column_missing('query_4', 'id');
RETURN QUERY SELECT lives_ok('query_5', 'Missing column out_edges but usable');
RETURN QUERY SELECT lives_ok('query_5', 'Missing column in_edges but usable');
RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_degree('SELECT id FROM foo', 'SELECT * FROM vertices')$$, 'foo');
RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_degree('SELECT id FROM edges', 'SELECT * FROM bar')$$, 'bar');

PREPARE subedges AS
SELECT id FROM edges WHERE id < 17;
Expand All @@ -90,12 +92,29 @@ BEGIN
SELECT * FROM pgr_degree('subedges','SELECT id, out_edges FROM vertices');

RETURN QUERY SELECT lives_ok('query_7', 'Good execution');
RETURN QUERY SELECT throws_ok('query_8', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT throws_ok('query_9', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT throws_ok('query_10', 'P0001', 'Missing column', 'Incomlete data -> throws');
RETURN QUERY SELECT column_missing('query_8', 'id');
RETURN QUERY SELECT column_missing('query_9', 'in_edges');
RETURN QUERY SELECT column_missing('query_10', 'id');
RETURN QUERY SELECT lives_ok('query_11', 'Missing column out_edges but usable');
RETURN QUERY SELECT lives_ok('query_12', 'Missing column in_edges but usable');

PREPARE empty_vertices AS
SELECT * FROM pgr_degree('SELECT id FROM edges', 'SELECT * FROM vertices WHERE id > 20');
RETURN QUERY SELECT is_empty('empty_vertices', 'Empty vertices give empty result');

PREPARE empty_graph AS
SELECT * FROM pgr_degree('SELECT id FROM edges WHERE id > 20', 'SELECT * FROM vertices') ORDER BY node;
RETURN QUERY
SELECT CASE WHEN min_version('3.8.0') THEN
collect_tap(
is_empty('empty_graph', 'is empty: Empty edges give 0 count on all vertices so none is in result')
)
ELSE
collect_tap(
results_eq('empty_graph', 'SELECT generate_series (1,17)::BIGINT, 0::BIGINT', 'Empty edges give 0 count')
)
END;

END;
$BODY$
LANGUAGE plpgsql;
Expand Down
Loading