Skip to content

Commit b39933f

Browse files
cvvergaracvvergara
committed
Standardizing output columns pgr_sequentialVertexColoring to (node,color)
1 parent 6797aad commit b39933f

6 files changed

Lines changed: 42 additions & 48 deletions

File tree

‎docqueries/coloring/sequentialVertexColoring.result‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ SELECT * FROM pgr_sequentialVertexColoring(
77
'SELECT id, source, target, cost, reverse_cost FROM edges
88
ORDER BY id'
99
);
10-
vertex_id | color_id
11-
-----------+----------
12-
1 | 1
13-
2 | 1
14-
3 | 2
15-
4 | 2
16-
5 | 1
17-
6 | 2
18-
7 | 1
19-
8 | 2
20-
9 | 1
21-
10 | 1
22-
11 | 2
23-
12 | 1
24-
13 | 1
25-
14 | 2
26-
15 | 2
27-
16 | 1
28-
17 | 2
10+
node | color
11+
------+-------
12+
1 | 1
13+
2 | 1
14+
3 | 2
15+
4 | 2
16+
5 | 1
17+
6 | 2
18+
7 | 1
19+
8 | 2
20+
9 | 1
21+
10 | 1
22+
11 | 2
23+
12 | 1
24+
13 | 1
25+
14 | 2
26+
15 | 2
27+
16 | 1
28+
17 | 2
2929
(17 rows)
3030

3131
/* -- q2 */

‎pgtap/coloring/bipartite/types_check.pg‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ BEGIN
4343

4444
RETURN QUERY
4545
SELECT function_types_eq('pgr_bipartite',
46-
$$SELECT '{text,int8,int8}'::TEXT[] $$
47-
);
46+
$$VALUES
47+
('{text,int8,int8}'::TEXT[])
48+
$$);
4849

4950
END;
5051
$BODY$

‎pgtap/coloring/sequentialVertexColoring/edge_cases.pg‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2020
BEGIN;
2121

2222
UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
23-
SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(18) END;
23+
SELECT CASE WHEN min_version('4.0.0') THEN plan(18) ELSE plan(1) END;
2424

2525
CREATE OR REPLACE FUNCTION edge_cases()
2626
RETURNS SETOF TEXT AS
2727
$BODY$
2828
BEGIN
2929

30-
IF NOT min_version('3.2.0') THEN
30+
IF NOT min_version('4.0.0') THEN
3131
RETURN QUERY
32-
SELECT skip(1, 'Function is new on 3.2.0');
32+
SELECT skip(1, 'pgr_sequentialVertexColoring: testing only signatures standardaized in v4.0.0.');
3333
RETURN;
3434
END IF;
3535

@@ -81,8 +81,8 @@ RETURN QUERY
8181
SELECT set_eq('q5', $$VALUES (7, 3, 7, 1, 1)$$, 'q5: Graph with two connected vertices');
8282

8383
PREPARE sequentialVertexColoring6 AS
84-
SELECT color_id, count(DISTINCT color_id)
85-
FROM pgr_sequentialVertexColoring('q5') GROUP BY color_id;
84+
SELECT color, count(DISTINCT color)
85+
FROM pgr_sequentialVertexColoring('q5') GROUP BY color;
8686

8787
RETURN QUERY
8888
SELECT set_eq('sequentialVertexColoring6', $$VALUES (1,1), (2, 1)$$, '6: Both vertices have different color');
@@ -130,7 +130,7 @@ RETURN QUERY
130130
SELECT set_eq('q9', $$VALUES (1, 5, 6, 1, 1), (2, 6, 10, -1, 1)$$, 'q9: Graph with three vertices');
131131

132132
PREPARE sequentialVertexColoring10 AS
133-
SELECT count(DISTINCT color_id) FROM pgr_sequentialVertexColoring('q9');
133+
SELECT count(DISTINCT color) FROM pgr_sequentialVertexColoring('q9');
134134

135135
RETURN QUERY
136136
SELECT set_eq('sequentialVertexColoring10', $$VALUES (2)$$, '10: Two colors are required');
@@ -166,7 +166,7 @@ SELECT set_eq('q11',
166166
);
167167

168168
PREPARE sequentialVertexColoring12 AS
169-
SELECT count(DISTINCT color_id)
169+
SELECT count(DISTINCT color)
170170
FROM pgr_sequentialVertexColoring('q11');
171171

172172
RETURN QUERY
@@ -191,7 +191,7 @@ SELECT set_eq('q13',
191191
);
192192

193193
PREPARE sequentialVertexColoring14 AS
194-
SELECT count(DISTINCT color_id) FROM pgr_sequentialVertexColoring('q13');
194+
SELECT count(DISTINCT color) FROM pgr_sequentialVertexColoring('q13');
195195

196196
RETURN QUERY
197197
SELECT set_eq('sequentialVertexColoring14', $$VALUES (2)$$, '14: Two colors are required');
@@ -216,7 +216,7 @@ SELECT set_eq('q15',
216216
);
217217

218218
PREPARE sequentialVertexColoring16 AS
219-
SELECT count(DISTINCT color_id) FROM pgr_sequentialVertexColoring('q15');
219+
SELECT count(DISTINCT color) FROM pgr_sequentialVertexColoring('q15');
220220

221221
RETURN QUERY
222222
SELECT set_eq('sequentialVertexColoring16', $$VALUES (2)$$, '16: Two colors are required');

‎pgtap/coloring/sequentialVertexColoring/types_check.pg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(5) END;
22+
SELECT CASE WHEN NOT min_version('4.0.0') THEN plan(1) ELSE plan(5) END;
2323

2424
CREATE OR REPLACE FUNCTION types_check()
2525
RETURNS SETOF TEXT AS
2626
$BODY$
2727
BEGIN
2828

29-
IF NOT min_version('3.2.0') THEN
29+
IF NOT min_version('4.0.0') THEN
3030
RETURN QUERY
31-
SELECT skip(1, 'Function is new on 3.2.0');
31+
SELECT skip(1, 'pgr_sequentialvertexcoloring: testing only signatures standardaized in v4.0.0.');
3232
RETURN;
3333
END IF;
3434

@@ -38,7 +38,7 @@ BEGIN
3838

3939
RETURN QUERY
4040
SELECT function_args_eq('pgr_sequentialvertexcoloring',
41-
$$SELECT '{"","vertex_id","color_id"}'::TEXT[] $$
41+
$$SELECT '{"","node","color"}'::TEXT[] $$
4242
);
4343

4444
RETURN QUERY

‎sql/coloring/sequentialVertexColoring.sql‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2727
2828
********************************************************************PGR-GNU*/
2929

30-
----------------------------------
31-
-- pgr_sequentialVertexColoring
32-
----------------------------------
33-
34-
35-
--v3.2
30+
--3.2
3631
CREATE FUNCTION pgr_sequentialVertexColoring(
3732
TEXT, -- edges_sql (required)
3833

39-
OUT vertex_id BIGINT,
40-
OUT color_id BIGINT)
34+
OUT node BIGINT,
35+
OUT color BIGINT)
4136
RETURNS SETOF RECORD AS
4237
$BODY$
43-
BEGIN
44-
RETURN QUERY
45-
SELECT a.vertex_id, a.color_id
46-
FROM _pgr_sequentialVertexColoring(_pgr_get_statement($1)) AS a;
47-
END;
38+
SELECT vertex_id, color_id
39+
FROM _pgr_sequentialVertexColoring(_pgr_get_statement($1));
4840
$BODY$
49-
LANGUAGE plpgsql VOLATILE STRICT;
41+
LANGUAGE SQL VOLATILE STRICT;
5042

5143
-- COMMENTS
5244

‎sql/scripts/build-extension-update-files.pl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ sub generate_upgrade_script {
277277
# Out parameters changed names on v4.0.0
278278
# Experimental functions
279279
push @commands, drop_special_case_function("pgr_dagshortestpath(text,text)");
280+
push @commands, drop_special_case_function("pgr_sequentialvertexcoloring(text)");
280281
push @commands, drop_special_case_function("pgr_bipartite(text)");
281282
}
282283

0 commit comments

Comments
 (0)