Skip to content

Commit 24e2767

Browse files
cvvergaracvvergara
committed
Removing deprecated signatures of pgr_withPointsKSP.sql
- Removing deprecated internal function _pgr_withPointsDD - Removing deprecated C code to legacy and adjusting remaining C code - (pgtap) Testing only valid signatures in 4.0.0 - Keeping the deprecated C code for the duration of v4
1 parent 139f539 commit 24e2767

File tree

10 files changed

+189
-175
lines changed

10 files changed

+189
-175
lines changed

‎pgtap/ksp/withPointsKSP/edge_cases/point_in_vertex.pg‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,17 @@ CREATE OR REPLACE FUNCTION test_vertex_points() RETURNS SETOF TEXT AS
2929
$BODY$
3030
BEGIN
3131

32-
IF NOT min_version('3.6.0') THEN
33-
RETURN QUERY SELECT skip(1, 'Signature added on 3.6.0');
34-
RETURN;
35-
END IF;
36-
32+
IF NOT min_version('3.6.0') THEN
33+
RETURN QUERY SELECT skip(1, 'pgr_withPointsKSP testing only valid signatures on 4.0.0');
34+
RETURN;
35+
END IF;
3736

3837
PREPARE dijkstra1(BIGINT, BIGINT) AS
3938
SELECT agg_cost::TEXT FROM pgr_KSP(
4039
$$SELECT id, source, target, cost, reverse_cost FROM four_edges$$,
4140
$1, $2, 3, true) WHERE edge < 0;
4241

43-
-- its a straigh line and one extreme are reachable
42+
-- its a straight line and one extreme are reachable
4443
RETURN QUERY SELECT results_eq($$dijkstra1(5,9)$$, ARRAY[4]::TEXT[]);
4544
RETURN QUERY SELECT results_eq($$dijkstra1(9,5)$$, ARRAY[4]::TEXT[]);
4645

‎pgtap/ksp/withPointsKSP/inner_query.pg‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ 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 min_version('3.6.0') THEN plan(684) ELSE plan(252) END;
23+
SELECT CASE WHEN min_version('3.6.0') THEN plan(432) ELSE plan(1) END;
2424

2525
CREATE OR REPLACE FUNCTION withPointsKSP_inner_query() RETURNS SETOF TEXT AS
2626
$BODY$
2727
BEGIN
28-
IF min_version('3.6.0') THEN
28+
29+
IF NOT min_version('3.6.0') THEN
30+
RETURN QUERY SELECT skip(1, 'pgr_withPointsKSP testing only valid signatures on 4.0.0');
31+
RETURN;
32+
END IF;
33+
2934
-- ONE TO ONE
3035
RETURN QUERY SELECT style_dijkstra('pgr_withPointsKSP(', ', $$SELECT * from pointsOfInterest$$, 6, 10, 1, $$r$$,true)');
3136
RETURN QUERY SELECT innerquery_points('pgr_withPointsKSP($$SELECT * FROM edges$$,', ', 6, 10, 1, $$l$$, true)');
@@ -42,17 +47,7 @@ BEGIN
4247
RETURN QUERY SELECT style_dijkstra('pgr_withPointsKSP(', ', $$SELECT * from pointsOfInterest$$, $$SELECT * FROM combinations$$, 2, $$r$$, true)');
4348
RETURN QUERY SELECT innerquery_points('pgr_withPointsKSP($$SELECT * FROM edges$$,', ', $$SELECT * FROM combinations$$, 2, $$r$$, true)');
4449
RETURN QUERY SELECT innerquery_combinations('pgr_withPointsKSP($$SELECT * FROM edges$$, $$SELECT * from pointsOfInterest$$,',', 2, $$r$$, true)');
45-
END IF;
46-
/* TODO Remove on v4*/
47-
-- ONE TO ONE
48-
SET client_min_messages TO ERROR;
49-
RETURN QUERY SELECT style_dijkstra('pgr_withPointsKSP(', ', $$SELECT * from pointsOfInterest$$, 5, 10, 2, driving_side => $$r$$, directed => true)');
50-
RETURN QUERY SELECT innerquery_points('pgr_withPointsKSP($$SELECT * FROM edges$$,', ', 6, 10, 2, driving_side => $$r$$, directed => true)');
51-
RETURN QUERY SELECT style_dijkstra('pgr_withPointsKSP(', ', $$SELECT * from pointsOfInterest$$, 5, 10, 2, true, true, $$r$$)');
52-
RETURN QUERY SELECT innerquery_points('pgr_withPointsKSP($$SELECT * FROM edges$$,', ', 6, 10, 2, true, true, $$r$$)');
53-
RETURN QUERY SELECT style_dijkstra('pgr_withPointsKSP(', ', $$SELECT * from pointsOfInterest$$, 5, 10, 2, true)');
54-
RETURN QUERY SELECT innerquery_points('pgr_withPointsKSP($$SELECT * FROM edges$$,', ', 6, 10, 2, true)');
55-
SET client_min_messages TO NOTICE;
50+
5651
END
5752
$BODY$
5853
LANGUAGE plpgsql VOLATILE;

‎pgtap/ksp/withPointsKSP/no_crash_test.pg‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
BEGIN;
2020

2121
UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
22-
SELECT CASE WHEN min_version('3.6.0') THEN plan(164) ELSE plan(26) END;
22+
SELECT CASE WHEN min_version('3.6.0') THEN plan(137) ELSE plan(1) END;
2323

2424
PREPARE edges AS
2525
SELECT id, source, target, cost, reverse_cost FROM edges;
@@ -33,17 +33,20 @@ SELECT array_agg(id) FROM vertices WHERE id IN (-1);
3333
PREPARE null_ret_arr AS
3434
SELECT array_agg(id) FROM vertices WHERE id IN (-1);
3535

36-
SELECT isnt_empty('edges', 'Should be not empty to tests be meaningful');
37-
SELECT set_eq('null_ret', 'SELECT NULL::BIGINT[]', 'Should be empty to tests be meaningful');
38-
3936
CREATE OR REPLACE FUNCTION test_function()
4037
RETURNS SETOF TEXT AS
4138
$BODY$
4239
DECLARE
4340
params TEXT[];
4441
subs TEXT[];
4542
BEGIN
46-
IF min_version('3.6.0') THEN
43+
44+
IF NOT min_version('3.6.0') THEN
45+
RETURN QUERY SELECT skip(1, 'pgr_withPointsKSP testing only valid signatures on 4.0.0');
46+
RETURN;
47+
END IF;
48+
49+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','character','boolean','boolean','boolean']);
4750
-- one to one
4851
params = ARRAY[
4952
'$$edges$$',
@@ -168,11 +171,6 @@ IF min_version('3.6.0') THEN
168171
PREPARE combinations AS
169172
SELECT source, target FROM combinations;
170173

171-
RETURN QUERY
172-
SELECT isnt_empty('combinations', 'Should be not empty to tests be meaningful');
173-
RETURN QUERY
174-
SELECT is_empty('null_combinations', 'Should be empty to tests be meaningful');
175-
176174
params = ARRAY['$$edges$$',
177175
'$$SELECT pid, edge_id, fraction from pointsOfInterest$$',
178176
'$$combinations$$',
@@ -197,35 +195,6 @@ IF min_version('3.6.0') THEN
197195
'NULL'
198196
]::TEXT[];
199197
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
200-
END IF;
201-
202-
/* TODO remove tests on v4*/
203-
-- 1 to distance
204-
params = ARRAY[
205-
'$$SELECT id, source, target, cost, reverse_cost FROM edges$$',
206-
'$$SELECT pid, edge_id, fraction from pointsOfInterest$$',
207-
'5',
208-
'6',
209-
'2'
210-
]::TEXT[];
211-
subs = ARRAY[
212-
'NULL',
213-
'NULL',
214-
'(SELECT id FROM vertices WHERE id IN (-1))',
215-
'(SELECT id FROM vertices WHERE id IN (-1))',
216-
'NULL'
217-
]::TEXT[];
218-
219-
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
220-
221-
subs = ARRAY[
222-
'NULL',
223-
'NULL',
224-
'NULL::BIGINT',
225-
'NULL::BIGINT',
226-
'NULL'
227-
]::TEXT[];
228-
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
229198

230199
END
231200
$BODY$

‎pgtap/ksp/withPointsKSP/types_check.pg‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,20 @@ along with this program; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818
********************************************************************PGR-GNU*/
1919
BEGIN;
20-
SELECT CASE WHEN min_version('3.6.0') THEN plan(15) ELSE plan(5) END;
20+
SELECT CASE WHEN min_version('3.6.0') THEN plan(13) ELSE plan(2) END;
2121

2222
SELECT has_function('pgr_withpointsksp');
2323

2424
CREATE FUNCTION withPointsKSP_types_check()
2525
RETURNS SETOF TEXT AS
2626
$BODY$
2727
BEGIN
28-
IF min_version('3.6.0') THEN
28+
29+
IF NOT min_version('3.6.0') THEN
30+
RETURN QUERY SELECT skip(1, 'pgr_withPointsKSP testing only valid signatures on 4.0.0');
31+
RETURN;
32+
END IF;
33+
2934
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','character','boolean','boolean','boolean']);
3035
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','anyarray','integer','character','boolean','boolean','boolean']);
3136
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','anyarray','bigint','integer','character','boolean','boolean','boolean']);
@@ -37,42 +42,42 @@ BEGIN
3742
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','anyarray','bigint','integer','character','boolean','boolean','boolean'],'setof record');
3843
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','anyarray','anyarray','integer','character','boolean','boolean','boolean'],'setof record');
3944
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','text','integer','character','boolean','boolean','boolean'],'setof record');
40-
END IF;
41-
/*Remove last 1 row on v4*/
42-
RETURN QUERY SELECT CASE WHEN min_version('3.6.0')
43-
THEN collect_tap(
4445

45-
function_args_eq('pgr_withpointsksp',
46-
$$VALUES
47-
('{"","","","","","","directed","heap_paths","details","seq","path_id","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
48-
('{"","","","","","directed","heap_paths","details","seq","path_id","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
49-
('{"","","","","","directed","heap_paths","driving_side","details","seq","path_id","path_seq","node","edge","cost","agg_cost"}'::TEXT[])
50-
$$),
46+
IF min_version('4.0.0') THEN
47+
48+
RETURN QUERY SELECT function_args_eq('pgr_withpointsksp',
49+
$$VALUES
50+
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[]),
51+
('{"","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[])
52+
$$);
53+
54+
RETURN QUERY SELECT function_types_eq('pgr_withpointsksp',
55+
$$VALUES
56+
('{text,text,int8,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
57+
('{text,text,int8,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
58+
('{text,text,anyarray,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
59+
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
60+
('{text,text,text,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[])
61+
$$);
5162

52-
function_types_eq('pgr_withpointsksp',
53-
$$VALUES
54-
('{text,text,int8,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
55-
('{text,text,int8,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
56-
('{text,text,anyarray,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
57-
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
58-
('{text,text,text,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
59-
('{text,text,int8,int8,int4,bool,bool,bpchar,bool,int4,int4,int4,int8,int8,float8,float8}'::TEXT[])
60-
$$)
61-
)
62-
ELSE collect_tap(
63+
ELSE
6364

64-
function_args_eq('pgr_withpointsksp',
65-
$$SELECT '{"","","","","","directed","heap_paths","driving_side","details","seq","path_id","path_seq","node","edge","cost","agg_cost"}'::TEXT[] $$
66-
),
65+
RETURN QUERY SELECT function_args_has('pgr_withpointsksp',
66+
$$VALUES
67+
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[]),
68+
('{"","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[])
69+
$$);
6770

68-
function_types_eq('pgr_withpointsksp',
69-
$$VALUES ('{text,text,int8,int8,int4,bool,bool,bpchar,bool,int4,int4,int4,int8,int8,float8,float8}'::TEXT[])$$
70-
)
71-
)END;
71+
RETURN QUERY SELECT function_types_has('pgr_withpointsksp',
72+
$$VALUES
73+
('{text,text,int8,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
74+
('{text,text,int8,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
75+
('{text,text,anyarray,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
76+
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
77+
('{text,text,text,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[])
78+
$$);
7279

73-
/* TODO remove on v4*/
74-
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','boolean','boolean','character','boolean']);
75-
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','boolean','boolean','character','boolean'],'setof record');
80+
END IF;
7681
END
7782
$BODY$
7883
LANGUAGE plpgsql VOLATILE;

‎sql/ksp/_withPointsKSP.sql‎

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2626
********************************************************************PGR-GNU*/
2727

2828
--------------------
29-
-- pgr_withPointsKSP
29+
-- pgr_withPointsKSP:
3030
--------------------
3131

32-
--v3.6
33-
CREATE FUNCTION _pgr_withPointsKSP(
32+
--v4.0
33+
CREATE FUNCTION _pgr_withPointsKSP_v4(
3434
TEXT, -- edges
3535
TEXT, -- points
3636
ANYARRAY, -- departures
@@ -41,7 +41,6 @@ CREATE FUNCTION _pgr_withPointsKSP(
4141
BOOLEAN, -- directed
4242
BOOLEAN, -- heaps
4343
BOOLEAN, -- details
44-
BOOLEAN, -- new ksp
4544

4645
OUT seq INTEGER,
4746
OUT path_id INTEGER,
@@ -56,8 +55,8 @@ RETURNS SETOF RECORD AS
5655
'MODULE_PATHNAME'
5756
LANGUAGE c STABLE STRICT;
5857

59-
--v3.6
60-
CREATE FUNCTION _pgr_withPointsKSP(
58+
--v4.0
59+
CREATE FUNCTION _pgr_withPointsKSP_v4(
6160
TEXT, -- edges
6261
TEXT, -- points
6362
TEXT, -- combinations
@@ -81,34 +80,8 @@ RETURNS SETOF RECORD AS
8180
'MODULE_PATHNAME'
8281
LANGUAGE c STABLE STRICT;
8382

84-
COMMENT ON FUNCTION _pgr_withPointsKSP(TEXT, TEXT, ANYARRAY, ANYARRAY, INTEGER, CHAR, BOOLEAN, BOOLEAN, BOOLEAN, BOOLEAN)
83+
COMMENT ON FUNCTION _pgr_withPointsKSP_v4(TEXT, TEXT, ANYARRAY, ANYARRAY, INTEGER, CHAR, BOOLEAN, BOOLEAN, BOOLEAN)
8584
IS 'pgRouting internal function';
8685

87-
COMMENT ON FUNCTION _pgr_withPointsKSP(TEXT, TEXT, TEXT, INTEGER, CHAR, BOOLEAN, BOOLEAN, BOOLEAN)
86+
COMMENT ON FUNCTION _pgr_withPointsKSP_v4(TEXT, TEXT, TEXT, INTEGER, CHAR, BOOLEAN, BOOLEAN, BOOLEAN)
8887
IS 'pgRouting internal function';
89-
90-
/*TODO remove on v4*/
91-
--v3.0
92-
CREATE FUNCTION _pgr_withPointsKSP(
93-
edges_sql TEXT,
94-
points_sql TEXT,
95-
start_pid BIGINT,
96-
end_pid BIGINT,
97-
k INTEGER,
98-
99-
directed BOOLEAN,
100-
heap_paths BOOLEAN,
101-
driving_side CHAR,
102-
details BOOLEAN,
103-
104-
OUT seq INTEGER, OUT path_id INTEGER, OUT path_seq INTEGER,
105-
OUT node BIGINT, OUT edge BIGINT,
106-
OUT cost FLOAT, OUT agg_cost FLOAT)
107-
RETURNS SETOF RECORD AS
108-
'MODULE_PATHNAME'
109-
LANGUAGE c STABLE STRICT;
110-
111-
-- COMMENTS
112-
113-
COMMENT ON FUNCTION _pgr_withPointsKSP(TEXT, TEXT, BIGINT, BIGINT, INTEGER, BOOLEAN, BOOLEAN, CHAR, BOOLEAN)
114-
IS 'pgRouting internal function deprecated on v3.6.0';

‎sql/ksp/withPointsKSP.sql‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CREATE FUNCTION pgr_withPointsKSP(
5151
RETURNS SETOF RECORD AS
5252
$BODY$
5353
SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
54-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9, true);
54+
FROM _pgr_withPointsKSP_v4(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9);
5555
$BODY$
5656
LANGUAGE SQL VOLATILE STRICT
5757
COST 100
@@ -83,7 +83,7 @@ CREATE FUNCTION pgr_withPointsKSP(
8383
RETURNS SETOF RECORD AS
8484
$BODY$
8585
SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
86-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9, true);
86+
FROM _pgr_withPointsKSP_v4(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9);
8787
$BODY$
8888
LANGUAGE SQL VOLATILE STRICT
8989
COST 100
@@ -115,7 +115,7 @@ CREATE FUNCTION pgr_withPointsKSP(
115115
RETURNS SETOF RECORD AS
116116
$BODY$
117117
SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
118-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9, true);
118+
FROM _pgr_withPointsKSP_v4(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9);
119119
$BODY$
120120
LANGUAGE SQL VOLATILE STRICT
121121
COST 100
@@ -147,7 +147,7 @@ CREATE FUNCTION pgr_withPointsKSP(
147147
RETURNS SETOF RECORD AS
148148
$BODY$
149149
SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
150-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9, true);
150+
FROM _pgr_withPointsKSP_v4(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9);
151151
$BODY$
152152
LANGUAGE SQL VOLATILE STRICT
153153
COST 100
@@ -178,7 +178,7 @@ CREATE FUNCTION pgr_withPointsKSP(
178178
RETURNS SETOF RECORD AS
179179
$BODY$
180180
SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
181-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), _pgr_get_statement($3), $4, $5, $6, $7, $8);
181+
FROM _pgr_withPointsKSP_v4(_pgr_get_statement($1), _pgr_get_statement($2), _pgr_get_statement($3), $4, $5, $6, $7, $8);
182182
$BODY$
183183
LANGUAGE SQL VOLATILE STRICT
184184
COST 100
@@ -264,38 +264,3 @@ IS 'pgr_withPointsKSP
264264
- details := false
265265
- Documentation:
266266
- ${PROJECT_DOC_LINK}/pgr_withPointsKSP.html';
267-
268-
--v2.6
269-
CREATE FUNCTION pgr_withPointsKSP(
270-
TEXT, -- edges_sql (required)
271-
TEXT, -- points_sql (required)
272-
BIGINT, -- from_vid (required)
273-
BIGINT, -- to_vid (required)
274-
INTEGER, -- K (required)
275-
276-
directed BOOLEAN DEFAULT true,
277-
heap_paths BOOLEAN DEFAULT false,
278-
driving_side CHAR DEFAULT 'b',
279-
details BOOLEAN DEFAULT false,
280-
281-
OUT seq INTEGER, OUT path_id INTEGER, OUT path_seq INTEGER,
282-
OUT node BIGINT, OUT edge BIGINT,
283-
OUT cost FLOAT, OUT agg_cost FLOAT)
284-
RETURNS SETOF RECORD AS
285-
$BODY$
286-
BEGIN
287-
RAISE WARNING 'pgr_withPointsKSP(text,text,bigint,bigint,integer,boolean,boolean,char,boolean) deprecated signature on v3.6.0';
288-
RETURN QUERY
289-
SELECT a.seq, a.path_id, a.path_seq, a.node, a.edge, a.cost, a.agg_cost
290-
FROM _pgr_withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), $3, $4, $5, $6, $7, $8, $9) AS a;
291-
END
292-
$BODY$
293-
LANGUAGE plpgsql VOLATILE STRICT
294-
COST 100
295-
ROWS 1000;
296-
297-
-- COMMENTS
298-
299-
COMMENT ON FUNCTION pgr_withPointsKSP(TEXT, TEXT, BIGINT, BIGINT, INTEGER, BOOLEAN, BOOLEAN, CHAR, BOOLEAN)
300-
IS 'pgr_withPointsKSP deprecated signature on v3.6.0
301-
- Documentation: ${PROJECT_DOC_LINK}/pgr_withPointsKSP.html';

0 commit comments

Comments
 (0)