Skip to content

Commit e710859

Browse files
cvvergaracvvergara
authored
General cleanup and minor changes (#2879)
* General cleanup and minor changes - Removing unused SQL/legacy files from early versions of 2.x - On SQL comments of experimental functions/signatures - Adding/Standardizing PROPOSED/EXPERIENTAL keyword * Fixing NEWS.md
1 parent b4da44f commit e710859

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+61
-2316
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ src/version/version.h
99
.directory
1010
notUsed
1111
*.swp
12+
13+
.vscode
14+
taptest.sh

‎NEWS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ In the deprecated functions:
114114

115115
## pgRouting 3.7
116116

117+
117118
<details> <summary>pgRouting 3.7.3 Release Notes</summary>
118119

119120
To see all issues & pull requests closed by this release see the [Git closed

‎configuration.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,3 @@ categories | N | N | Y
5454
#----------------------
5555
topology | N | Y | Y
5656
utilities | N | Y | Y
57-
deprecated | N | Y | N

‎doc/src/release_notes.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ In the deprecated functions:
146146
pgRouting 3.7
147147
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
148148

149+
.. contents:: Contents
150+
:local:
151+
:depth: 1
152+
149153
pgRouting 3.7.3 Release Notes
150154
-------------------------------------------------------------------------------
151155

‎docqueries/src/migration.pg‎

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ SELECT * FROM new_restrictions;
3434
/* --rest5 */
3535

3636
/* --verticesv1 */
37-
SELECT * FROM pgr_trsp(
38-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
39-
FROM edges WHERE id != 16$$,
40-
15, 16,
41-
true, true);
4237
/* --verticesv2 */
4338
SELECT * FROM pgr_dijkstra(
4439
$$SELECT id, source, target, cost, reverse_cost
@@ -51,13 +46,6 @@ FROM pgr_dijkstra(
5146
FROM edges WHERE id != 16$$,
5247
15, 16);
5348
/* --verticesv4 */
54-
SELECT * FROM pgr_trsp(
55-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
56-
FROM edges WHERE id != 16$$,
57-
15, 16,
58-
true, true,
59-
$$SELECT to_cost, target_id::INTEGER, via_path
60-
FROM old_restrictions$$);
6149
/* --verticesv5 */
6250
SELECT * FROM pgr_trsp(
6351
$$SELECT id, source, target, cost, reverse_cost
@@ -75,11 +63,6 @@ FROM pgr_trsp(
7563
SELECT pid, edge_id, fraction, side FROM pointsOfInterest
7664
WHERE pid IN (3, 4);
7765
/* --edgesv1 */
78-
SELECT * FROM pgr_trsp(
79-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
80-
FROM edges$$,
81-
6, 0.3, 12, 0.6,
82-
true, true);
8366
/* --edgesv2 */
8467
SELECT * FROM pgr_withPoints(
8568
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -94,10 +77,6 @@ FROM pgr_withPoints(
9477
-1, -2,
9578
details => false);
9679
/* --edgesv4 */
97-
SELECT * FROM pgr_trsp(
98-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
99-
6, 0.3, 12, 0.6, true, true,
100-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
10180
/* --edgesv5 */
10281
SELECT * FROM pgr_trsp_withPoints(
10382
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -115,11 +94,6 @@ FROM pgr_trsp_withPoints(
11594
details => false)
11695
WHERE edge != -1;
11796
/* --edgesv7 */
118-
/* --viav1 */
119-
SELECT * FROM pgr_trspViaVertices(
120-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
121-
ARRAY[6, 3, 6],
122-
true, true);
12397
/* --viav2 */
12498
SELECT * FROM pgr_dijkstraVia(
12599
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -133,11 +107,6 @@ FROM pgr_dijkstraVia(
133107
ARRAY[6, 3, 6])
134108
WHERE edge != -1;
135109
/* --viav4*/
136-
SELECT * FROM pgr_trspViaVertices(
137-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
138-
ARRAY[6, 3, 6],
139-
true, true,
140-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
141110
/* --viav5 */
142111
SELECT * FROM pgr_trspVia(
143112
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -156,10 +125,7 @@ WHERE edge != -1;
156125
SELECT pid, edge_id, fraction, side FROM pointsOfInterest
157126
WHERE pid IN (3, 4, 6);
158127
/* --edgesvia1 */
159-
SELECT * FROM pgr_trspViaEdges(
160-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
161-
ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
162-
true, true);
128+
SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6);
163129
/* --edgesvia2 */
164130
SELECT * FROM pgr_withPointsVia(
165131
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -172,15 +138,10 @@ path_id::INTEGER AS id1, node::INTEGER AS id2,
172138
CASE WHEN edge >= 0 THEN edge::INTEGER ELSE -1 END AS id3, cost::FLOAT
173139
FROM pgr_withPointsVia(
174140
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
175-
$$SELECT * FROM (VALUES (1, 6, 0.3),(2, 12, 0.6),(3, 4, 0.7)) AS t(pid, edge_id, fraction)$$,
176-
ARRAY[-1, -2, -3],
177-
details=> false);
141+
$$SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6)$$,
142+
ARRAY[-4, -3, -6],
143+
details => false);
178144
/* --edgesvia4 */
179-
SELECT * FROM pgr_trspViaEdges(
180-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
181-
ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
182-
true, true,
183-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
184145
/* --edgesvia5 */
185146
SELECT * FROM pgr_trspVia_withPoints(
186147
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,

‎docqueries/src/migration.result‎

Lines changed: 14 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ SELECT * FROM new_restrictions;
6565

6666
/* --rest5 */
6767
/* --verticesv1 */
68-
SELECT * FROM pgr_trsp(
69-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
70-
FROM edges WHERE id != 16$$,
71-
15, 16,
72-
true, true);
73-
WARNING: pgr_trsp(text,integer,integer,boolean,boolean) deprecated signature on v3.4.0
74-
seq | id1 | id2 | cost
75-
-----+-----+-----+------
76-
0 | 15 | 3 | 1
77-
1 | 10 | 5 | 1
78-
2 | 11 | 9 | 1
79-
3 | 16 | -1 | 0
80-
(4 rows)
81-
8268
/* --verticesv2 */
8369
SELECT * FROM pgr_dijkstra(
8470
$$SELECT id, source, target, cost, reverse_cost
@@ -107,24 +93,6 @@ FROM pgr_dijkstra(
10793
(4 rows)
10894

10995
/* --verticesv4 */
110-
SELECT * FROM pgr_trsp(
111-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
112-
FROM edges WHERE id != 16$$,
113-
15, 16,
114-
true, true,
115-
$$SELECT to_cost, target_id::INTEGER, via_path
116-
FROM old_restrictions$$);
117-
WARNING: pgr_trsp(text,integer,integer,boolean,boolean) deprecated signature on v3.4.0
118-
seq | id1 | id2 | cost
119-
-----+-----+-----+------
120-
0 | 15 | 3 | 1
121-
1 | 10 | 5 | 1
122-
2 | 11 | 11 | 1
123-
3 | 12 | 13 | 1
124-
4 | 17 | 15 | 1
125-
5 | 16 | -1 | 0
126-
(6 rows)
127-
12896
/* --verticesv5 */
12997
SELECT * FROM pgr_trsp(
13098
$$SELECT id, source, target, cost, reverse_cost
@@ -168,21 +136,6 @@ WHERE pid IN (3, 4);
168136
(2 rows)
169137

170138
/* --edgesv1 */
171-
SELECT * FROM pgr_trsp(
172-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
173-
FROM edges$$,
174-
6, 0.3, 12, 0.6,
175-
true, true);
176-
WARNING: pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
177-
seq | id1 | id2 | cost
178-
-----+-----+-----+------
179-
0 | -1 | 6 | 0.7
180-
1 | 3 | 7 | 1
181-
2 | 7 | 10 | 1
182-
3 | 8 | 12 | 0.6
183-
4 | -2 | -1 | 0
184-
(5 rows)
185-
186139
/* --edgesv2 */
187140
SELECT * FROM pgr_withPoints(
188141
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -215,25 +168,6 @@ FROM pgr_withPoints(
215168
(5 rows)
216169

217170
/* --edgesv4 */
218-
SELECT * FROM pgr_trsp(
219-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
220-
6, 0.3, 12, 0.6, true, true,
221-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
222-
WARNING: pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
223-
seq | id1 | id2 | cost
224-
-----+-----+-----+------
225-
0 | -1 | 6 | 0.7
226-
1 | 3 | 7 | 1
227-
2 | 7 | 8 | 1
228-
3 | 11 | 9 | 1
229-
4 | 16 | 16 | 1
230-
5 | 15 | 3 | 1
231-
6 | 10 | 2 | 1
232-
7 | 6 | 4 | 1
233-
8 | 7 | 10 | 1
234-
9 | 8 | 12 | 0.6
235-
(10 rows)
236-
237171
/* --edgesv5 */
238172
SELECT * FROM pgr_trsp_withPoints(
239173
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -280,21 +214,6 @@ WHERE edge != -1;
280214
(10 rows)
281215

282216
/* --edgesv7 */
283-
/* --viav1 */
284-
SELECT * FROM pgr_trspViaVertices(
285-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
286-
ARRAY[6, 3, 6],
287-
true, true);
288-
WARNING: pgr_trspViaVertices(text,anyarray,boolean,boolean,text) deprecated function on v3.4.0
289-
seq | id1 | id2 | id3 | cost
290-
-----+-----+-----+-----+------
291-
1 | 1 | 6 | 4 | 1
292-
2 | 1 | 7 | 7 | 1
293-
3 | 2 | 3 | 7 | 1
294-
4 | 2 | 7 | 4 | 1
295-
5 | 2 | 6 | -1 | 0
296-
(5 rows)
297-
298217
/* --viav2 */
299218
SELECT * FROM pgr_dijkstraVia(
300219
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -327,27 +246,6 @@ WHERE edge != -1;
327246
(5 rows)
328247

329248
/* --viav4*/
330-
SELECT * FROM pgr_trspViaVertices(
331-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
332-
ARRAY[6, 3, 6],
333-
true, true,
334-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
335-
WARNING: pgr_trspViaVertices(text,anyarray,boolean,boolean,text) deprecated function on v3.4.0
336-
seq | id1 | id2 | id3 | cost
337-
-----+-----+-----+-----+------
338-
1 | 1 | 6 | 4 | 1
339-
2 | 1 | 7 | 8 | 1
340-
3 | 1 | 11 | 9 | 1
341-
4 | 1 | 16 | 16 | 1
342-
5 | 1 | 15 | 3 | 1
343-
6 | 1 | 10 | 5 | 1
344-
7 | 1 | 11 | 8 | 1
345-
8 | 1 | 7 | 7 | 1
346-
9 | 2 | 3 | 7 | 1
347-
10 | 2 | 7 | 4 | 1
348-
11 | 2 | 6 | -1 | 0
349-
(11 rows)
350-
351249
/* --viav5 */
352250
SELECT * FROM pgr_trspVia(
353251
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -404,26 +302,13 @@ WHERE pid IN (3, 4, 6);
404302
(3 rows)
405303

406304
/* --edgesvia1 */
407-
SELECT * FROM pgr_trspViaEdges(
408-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
409-
ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
410-
true, true);
411-
WARNING: pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text) deprecated function on v3.4.0
412-
seq | id1 | id2 | id3 | cost
413-
-----+-----+-----+-----+------
414-
1 | 1 | -1 | 6 | 0.7
415-
2 | 1 | 3 | 7 | 1
416-
3 | 1 | 7 | 10 | 1
417-
4 | 1 | 8 | 12 | 0.6
418-
5 | 1 | -2 | -1 | 0
419-
6 | 2 | -2 | 12 | 0.4
420-
7 | 2 | 12 | 13 | 1
421-
8 | 2 | 17 | 15 | 1
422-
9 | 2 | 16 | 9 | 1
423-
10 | 2 | 11 | 8 | 1
424-
11 | 2 | 7 | 4 | 0.7
425-
12 | 2 | -3 | -2 | 0
426-
(12 rows)
305+
SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6);
306+
pid | edge_id | fraction
307+
-----+---------+----------
308+
3 | 12 | 0.6
309+
4 | 6 | 0.3
310+
6 | 4 | 0.7
311+
(3 rows)
427312

428313
/* --edgesvia2 */
429314
SELECT * FROM pgr_withPointsVia(
@@ -453,53 +338,26 @@ path_id::INTEGER AS id1, node::INTEGER AS id2,
453338
CASE WHEN edge >= 0 THEN edge::INTEGER ELSE -1 END AS id3, cost::FLOAT
454339
FROM pgr_withPointsVia(
455340
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
456-
$$SELECT * FROM (VALUES (1, 6, 0.3),(2, 12, 0.6),(3, 4, 0.7)) AS t(pid, edge_id, fraction)$$,
457-
ARRAY[-1, -2, -3],
458-
details=> false);
341+
$$SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6)$$,
342+
ARRAY[-4, -3, -6],
343+
details => false);
459344
seq | id1 | id2 | id3 | cost
460345
-----+-----+-----+-----+------
461-
1 | 1 | -1 | 6 | 0.7
346+
1 | 1 | -4 | 6 | 0.7
462347
2 | 1 | 3 | 7 | 1
463348
3 | 1 | 7 | 10 | 1
464349
4 | 1 | 8 | 12 | 0.6
465-
5 | 1 | -2 | -1 | 0
466-
6 | 2 | -2 | 12 | 0.4
350+
5 | 1 | -3 | -1 | 0
351+
6 | 2 | -3 | 12 | 0.4
467352
7 | 2 | 12 | 13 | 1
468353
8 | 2 | 17 | 15 | 1
469354
9 | 2 | 16 | 9 | 1
470355
10 | 2 | 11 | 8 | 1
471356
11 | 2 | 7 | 4 | 0.3
472-
12 | 2 | -3 | -1 | 0
357+
12 | 2 | -6 | -1 | 0
473358
(12 rows)
474359

475360
/* --edgesvia4 */
476-
SELECT * FROM pgr_trspViaEdges(
477-
$$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
478-
ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
479-
true, true,
480-
$$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
481-
WARNING: pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text) deprecated function on v3.4.0
482-
WARNING: pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
483-
WARNING: pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
484-
seq | id1 | id2 | id3 | cost
485-
-----+-----+-----+-----+------
486-
1 | 1 | -1 | 6 | 0.7
487-
2 | 1 | 3 | 7 | 1
488-
3 | 1 | 7 | 8 | 1
489-
4 | 1 | 11 | 9 | 1
490-
5 | 1 | 16 | 16 | 1
491-
6 | 1 | 15 | 3 | 1
492-
7 | 1 | 10 | 2 | 1
493-
8 | 1 | 6 | 4 | 1
494-
9 | 1 | 7 | 10 | 1
495-
10 | 1 | 8 | 12 | 1
496-
11 | 2 | 12 | 13 | 1
497-
12 | 2 | 17 | 15 | 1
498-
13 | 2 | 16 | 9 | 1
499-
14 | 2 | 11 | 8 | 1
500-
15 | 2 | 7 | 4 | 0.3
501-
(15 rows)
502-
503361
/* --edgesvia5 */
504362
SELECT * FROM pgr_trspVia_withPoints(
505363
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,

‎docqueries/src/test.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
%main::tests = (
44
'any' => {
55
'files' => [qw(
6+
concepts.pg
7+
migration.pg
68
sampledata.pg
79
withPoints-category.pg
8-
migration.pg
9-
concepts.pg
1010
)],
1111
},
1212
);

0 commit comments

Comments
 (0)