Skip to content

Commit b8aa244

Browse files
cvvergaracvvergara
committed
reverting some changes from c1b21c2 
1 parent 41e90fe commit b8aa244

File tree

10 files changed

+52
-124
lines changed

10 files changed

+52
-124
lines changed

‎NEWS.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ milestone for 4.0.0
6060
* _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
6161
* _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
6262
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
63-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)
64-
* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)
6563
* _pgr_dijkstra(text,text,boolean,boolean,boolean)
6664
* _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
6765
* _pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
@@ -77,10 +75,6 @@ milestone for 4.0.0
7775
**Deprecation of internal C/C++ functions**
7876

7977
* _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
80-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)``
81-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)``
82-
* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)``
83-
* _pgr_dijkstra(text,text,boolean,boolean,boolean)``
8478

8579
**Internal C/C++ functions in legacy**
8680

‎doc/src/release_notes.rst‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ milestone for 4.0.0
9191
* _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
9292
* _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
9393
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
94-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)
95-
* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)
9694
* _pgr_dijkstra(text,text,boolean,boolean,boolean)
9795
* _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
9896
* _pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
@@ -108,10 +106,6 @@ milestone for 4.0.0
108106
.. rubric:: Deprecation of internal C/C++ functions
109107

110108
* _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
111-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)``
112-
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)``
113-
* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)``
114-
* _pgr_dijkstra(text,text,boolean,boolean,boolean)``
115109

116110
.. rubric:: Internal C/C++ functions in legacy
117111

‎sql/dijkstra/_dijkstra.sql‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2828
2929
********************************************************************PGR-GNU*/
3030

31-
--v4.0
32-
CREATE FUNCTION _pgr_dijkstrav4(
31+
--v3.2
32+
CREATE FUNCTION _pgr_dijkstra(
3333
edges_sql TEXT,
34-
combinations_sql TEXT,
3534
start_vids ANYARRAY,
3635
end_vids ANYARRAY,
3736
directed BOOLEAN,
@@ -50,6 +49,34 @@ CREATE FUNCTION _pgr_dijkstrav4(
5049
OUT agg_cost FLOAT)
5150
RETURNS SETOF RECORD AS
5251
'MODULE_PATHNAME'
53-
LANGUAGE C VOLATILE;
52+
LANGUAGE C VOLATILE STRICT;
53+
54+
55+
--v3.2
56+
CREATE FUNCTION _pgr_dijkstra(
57+
edges_sql TEXT,
58+
combinations_sql TEXT,
59+
directed BOOLEAN,
60+
only_cost BOOLEAN,
61+
n_goals BIGINT,
62+
global BOOLEAN,
63+
64+
OUT seq INTEGER,
65+
OUT path_seq INTEGER,
66+
OUT start_vid BIGINT,
67+
OUT end_vid BIGINT,
68+
OUT node BIGINT,
69+
OUT edge BIGINT,
70+
OUT cost FLOAT,
71+
OUT agg_cost FLOAT)
72+
RETURNS SETOF RECORD AS
73+
'MODULE_PATHNAME'
74+
LANGUAGE C VOLATILE STRICT;
75+
76+
-- COMMENTS
5477

78+
COMMENT ON FUNCTION _pgr_dijkstra(TEXT, ANYARRAY, ANYARRAY, BOOLEAN, BOOLEAN, BOOLEAN, BIGINT, BOOLEAN)
79+
IS 'pgRouting internal function';
5580

81+
COMMENT ON FUNCTION _pgr_dijkstra(TEXT, TEXT, BOOLEAN, BOOLEAN, BIGINT, BOOLEAN)
82+
IS 'pgRouting internal function';

‎sql/dijkstra/dijkstra.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CREATE FUNCTION pgr_dijkstra(
5353
RETURNS SETOF RECORD AS
5454
$BODY$
5555
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
56-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, true, 0, false);
56+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, true, 0, false);
5757
$BODY$
5858
LANGUAGE sql VOLATILE STRICT
5959
COST 100
@@ -79,7 +79,7 @@ CREATE FUNCTION pgr_dijkstra(
7979
RETURNS SETOF RECORD AS
8080
$BODY$
8181
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
82-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
82+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
8383
$BODY$
8484
LANGUAGE sql VOLATILE STRICT
8585
COST 100
@@ -105,7 +105,7 @@ CREATE FUNCTION pgr_dijkstra(
105105
RETURNS SETOF RECORD AS
106106
$BODY$
107107
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
108-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, false, 0, false);
108+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, false, 0, false);
109109
$BODY$
110110
LANGUAGE sql VOLATILE STRICT
111111
COST 100
@@ -131,7 +131,7 @@ CREATE FUNCTION pgr_dijkstra(
131131
RETURNS SETOF RECORD AS
132132
$BODY$
133133
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
134-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
134+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
135135
$BODY$
136136
LANGUAGE sql VOLATILE STRICT
137137
COST 100
@@ -156,7 +156,7 @@ CREATE FUNCTION pgr_dijkstra(
156156
RETURNS SETOF RECORD AS
157157
$BODY$
158158
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
159-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), _pgr_get_statement($2), NULL::BIGINT[], NULL::BIGINT[], $3, false, true, 0, false);
159+
FROM _pgr_dijkstra(_pgr_get_statement($1), _pgr_get_statement($2), $3, false, 0, false);
160160
$BODY$
161161
LANGUAGE sql VOLATILE STRICT
162162
COST 100

‎sql/dijkstra/dijkstraCost.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CREATE FUNCTION pgr_dijkstraCost(
4343
RETURNS SETOF RECORD AS
4444
$BODY$
4545
SELECT start_vid, end_vid, agg_cost
46-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, true, true, 0, false);
46+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, true, true, 0, false);
4747
$BODY$
4848
LANGUAGE sql VOLATILE STRICT
4949
COST 100
@@ -66,7 +66,7 @@ CREATE FUNCTION pgr_dijkstraCost(
6666
RETURNS SETOF RECORD AS
6767
$BODY$
6868
SELECT start_vid, end_vid, agg_cost
69-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, true, true, 0, false);
69+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, true, true, 0, false);
7070
$BODY$
7171
LANGUAGE sql VOLATILE STRICT
7272
COST 100
@@ -90,7 +90,7 @@ CREATE FUNCTION pgr_dijkstraCost(
9090
RETURNS SETOF RECORD AS
9191
$BODY$
9292
SELECT start_vid, end_vid, agg_cost
93-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, true, false, 0, false);
93+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, true, true, 0, false);
9494
$BODY$
9595
LANGUAGE sql VOLATILE STRICT
9696
COST 100
@@ -114,7 +114,7 @@ CREATE FUNCTION pgr_dijkstraCost(
114114
RETURNS SETOF RECORD AS
115115
$BODY$
116116
SELECT start_vid, end_vid, agg_cost
117-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], $3::BIGINT[], $4, true, true, 0, false);
117+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, true, true, 0, false);
118118
$BODY$
119119
LANGUAGE sql VOLATILE STRICT
120120
COST 100
@@ -134,7 +134,7 @@ CREATE FUNCTION pgr_dijkstraCost(
134134
RETURNS SETOF RECORD AS
135135
$BODY$
136136
SELECT start_vid, end_vid, agg_cost
137-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), _pgr_get_statement($2), NULL::BIGINT[], NULL::BIGINT[], $3, true, true, 0, false);
137+
FROM _pgr_dijkstra(_pgr_get_statement($1), _pgr_get_statement($2), $3, true, 0, false);
138138
$BODY$
139139
LANGUAGE sql VOLATILE STRICT
140140
COST 100

‎sql/dijkstra/dijkstraCostMatrix.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CREATE FUNCTION pgr_dijkstraCostMatrix(
4242
RETURNS SETOF RECORD AS
4343
$BODY$
4444
SELECT a.start_vid, a.end_vid, a.agg_cost
45-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2, $2, $3, true, true, 0, false) a;
45+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2, $2, $3, true, true, 0, false) a;
4646
$BODY$
4747
LANGUAGE SQL VOLATILE STRICT
4848
COST 100

‎sql/dijkstra/dijkstraNear.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CREATE FUNCTION pgr_dijkstraNear(
4949
RETURNS SETOF RECORD AS
5050
$BODY$
5151
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
52-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], $3::BIGINT[], directed, false, true, cap, false);
52+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], directed, false, true, cap, false);
5353
$BODY$
5454
LANGUAGE sql VOLATILE STRICT
5555
COST 100
@@ -76,7 +76,7 @@ CREATE FUNCTION pgr_dijkstraNear(
7676
RETURNS SETOF RECORD AS
7777
$BODY$
7878
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
79-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], ARRAY[$3]::BIGINT[], directed, false, false, cap, false);
79+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], directed, false, false, cap, false);
8080
$BODY$
8181
LANGUAGE sql VOLATILE STRICT
8282
COST 100
@@ -104,7 +104,7 @@ CREATE FUNCTION pgr_dijkstraNear(
104104
RETURNS SETOF RECORD AS
105105
$BODY$
106106
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
107-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], $3::BIGINT[], directed, false, true, cap, global);
107+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], directed, false, true, cap, global);
108108
$BODY$
109109
LANGUAGE sql VOLATILE STRICT
110110
COST 100
@@ -131,7 +131,7 @@ CREATE FUNCTION pgr_dijkstraNear(
131131
RETURNS SETOF RECORD AS
132132
$BODY$
133133
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
134-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), _pgr_get_statement($2), NULL::BIGINT[], NULL::BIGINT[], directed, false, true, cap, global);
134+
FROM _pgr_dijkstra(_pgr_get_statement($1), _pgr_get_statement($2), directed, false, cap, global);
135135
$BODY$
136136
LANGUAGE sql VOLATILE STRICT
137137
COST 100

‎sql/dijkstra/dijkstraNearCost.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CREATE FUNCTION pgr_dijkstraNearCost(
4444
RETURNS SETOF RECORD AS
4545
$BODY$
4646
SELECT start_vid, end_vid, agg_cost
47-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], $3::BIGINT[], directed, true, true, cap, true);
47+
FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], directed, true, true, cap, true);
4848
$BODY$
4949
LANGUAGE sql VOLATILE STRICT
5050
COST 100
@@ -66,7 +66,7 @@ CREATE FUNCTION pgr_dijkstraNearCost(
6666
RETURNS SETOF RECORD AS
6767
$BODY$
6868
SELECT start_vid, end_vid, agg_cost
69-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], ARRAY[$3]::BIGINT[], directed, true, false, cap, true);
69+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], directed, true, false, cap, true);
7070
$BODY$
7171
LANGUAGE sql VOLATILE STRICT
7272
COST 100
@@ -89,7 +89,7 @@ CREATE FUNCTION pgr_dijkstraNearCost(
8989
RETURNS SETOF RECORD AS
9090
$BODY$
9191
SELECT start_vid, end_vid, agg_cost
92-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], $3::BIGINT[], directed, true, true, cap, global);
92+
FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], directed, true, true, cap, global);
9393
$BODY$
9494
LANGUAGE sql VOLATILE STRICT
9595
COST 100
@@ -111,7 +111,7 @@ CREATE FUNCTION pgr_dijkstraNearCost(
111111
RETURNS SETOF RECORD AS
112112
$BODY$
113113
SELECT start_vid, end_vid, agg_cost
114-
FROM _pgr_dijkstrav4(_pgr_get_statement($1), _pgr_get_statement($2), NULL::BIGINT[], NULL::BIGINT[], directed, true, true, cap, global);
114+
FROM _pgr_dijkstra(_pgr_get_statement($1), _pgr_get_statement($2), directed, true, cap, global);
115115
$BODY$
116116
LANGUAGE sql VOLATILE STRICT
117117
COST 100

‎sql/sigs/pgrouting--4.0.sig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,12 @@ pgr_dijkstranear(text,anyarray,bigint,boolean,bigint)
120120
pgr_dijkstranear(text,bigint,anyarray,boolean,bigint)
121121
pgr_dijkstranear(text,text,boolean,bigint,boolean)
122122
pgr_dijkstra(text,anyarray,anyarray,boolean)
123+
_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)
123124
pgr_dijkstra(text,anyarray,bigint,boolean)
124125
pgr_dijkstra(text,bigint,anyarray,boolean)
125126
pgr_dijkstra(text,bigint,bigint,boolean)
126127
pgr_dijkstra(text,text,boolean)
127-
_pgr_dijkstrav4(text,text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)
128+
_pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)
128129
_pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
129130
pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
130131
pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)

‎src/dijkstra/dijkstra.c‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4343

4444
PG_MODULE_MAGIC;
4545

46-
PGDLLEXPORT Datum _pgr_dijkstrav4(PG_FUNCTION_ARGS);
47-
PG_FUNCTION_INFO_V1(_pgr_dijkstrav4);
48-
4946
PGDLLEXPORT Datum _pgr_dijkstra(PG_FUNCTION_ARGS);
5047
PG_FUNCTION_INFO_V1(_pgr_dijkstra);
5148

@@ -115,91 +112,6 @@ process(
115112
pgr_SPI_finish();
116113
}
117114

118-
PGDLLEXPORT Datum
119-
_pgr_dijkstrav4(PG_FUNCTION_ARGS) {
120-
FuncCallContext *funcctx;
121-
TupleDesc tuple_desc;
122-
123-
Path_rt *result_tuples = NULL;
124-
size_t result_count = 0;
125-
126-
if (SRF_IS_FIRSTCALL()) {
127-
MemoryContext oldcontext;
128-
funcctx = SRF_FIRSTCALL_INIT();
129-
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
130-
131-
if (PG_ARGISNULL(1)) PGR_DBG("is null");
132-
process(
133-
text_to_cstring(PG_GETARG_TEXT_P(0)),
134-
PG_ARGISNULL(1)? NULL : text_to_cstring(PG_GETARG_TEXT_P(1)),
135-
PG_ARGISNULL(2)? NULL : PG_GETARG_ARRAYTYPE_P(2),
136-
PG_ARGISNULL(3)? NULL : PG_GETARG_ARRAYTYPE_P(3),
137-
PG_GETARG_BOOL(4),
138-
PG_GETARG_BOOL(5),
139-
PG_GETARG_BOOL(6),
140-
PG_GETARG_INT64(7),
141-
PG_GETARG_BOOL(8),
142-
&result_tuples,
143-
&result_count);
144-
145-
funcctx->max_calls = result_count;
146-
funcctx->user_fctx = result_tuples;
147-
if (get_call_result_type(fcinfo, NULL, &tuple_desc)
148-
!= TYPEFUNC_COMPOSITE) {
149-
ereport(ERROR,
150-
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
151-
errmsg("function returning record called in context "
152-
"that cannot accept type record")));
153-
}
154-
155-
funcctx->tuple_desc = tuple_desc;
156-
MemoryContextSwitchTo(oldcontext);
157-
}
158-
159-
funcctx = SRF_PERCALL_SETUP();
160-
tuple_desc = funcctx->tuple_desc;
161-
result_tuples = (Path_rt*) funcctx->user_fctx;
162-
163-
if (funcctx->call_cntr < funcctx->max_calls) {
164-
HeapTuple tuple;
165-
Datum result;
166-
Datum *values;
167-
bool* nulls;
168-
size_t call_cntr = funcctx->call_cntr;
169-
170-
size_t numb = 8;
171-
values = palloc(numb * sizeof(Datum));
172-
nulls = palloc(numb * sizeof(bool));
173-
174-
size_t i;
175-
for (i = 0; i < numb; ++i) {
176-
nulls[i] = false;
177-
}
178-
179-
int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id;
180-
181-
values[0] = Int32GetDatum((int32_t)call_cntr + 1);
182-
values[1] = Int32GetDatum((int32_t)seq);
183-
values[2] = Int64GetDatum(result_tuples[call_cntr].start_id);
184-
values[3] = Int64GetDatum(result_tuples[call_cntr].end_id);
185-
values[4] = Int64GetDatum(result_tuples[call_cntr].node);
186-
values[5] = Int64GetDatum(result_tuples[call_cntr].edge);
187-
values[6] = Float8GetDatum(result_tuples[call_cntr].cost);
188-
values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost);
189-
190-
result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1;
191-
192-
tuple = heap_form_tuple(tuple_desc, values, nulls);
193-
result = HeapTupleGetDatum(tuple);
194-
SRF_RETURN_NEXT(funcctx, result);
195-
} else {
196-
SRF_RETURN_DONE(funcctx);
197-
}
198-
}
199-
200-
201-
/* kept for backwards compatibility
202-
* TODO remove on 5.0.0 */
203115
PGDLLEXPORT Datum
204116
_pgr_dijkstra(PG_FUNCTION_ARGS) {
205117
FuncCallContext *funcctx;

0 commit comments

Comments
 (0)