Skip to content

Commit 45c588c

Browse files
cvvergaracvvergara
committed
(SQL) setting big costs on functions
- Fixing some ordering on trsp
1 parent 450b7a6 commit 45c588c

File tree

151 files changed

+502
-551
lines changed

Some content is hidden

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

151 files changed

+502
-551
lines changed

‎sql/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
add_subdirectory(sigs)
22

3+
SET(COST_HIGH 10000)
4+
SET(COST_MED 5000)
5+
SET(COST_LOW 100)
6+
7+
SET(ROWS_HIGH 10000)
8+
SET(ROWS_MED 5000)
9+
SET(ROWS_LOW 100)
310

411
#-------------------
512
# From the parent get the subdirectories that have the SQL files

‎sql/allpairs/_floydWarshall.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ CREATE FUNCTION _pgr_floydWarshall(
4242
OUT agg_cost FLOAT)
4343
RETURNS SETOF RECORD AS
4444
'MODULE_PATHNAME'
45-
LANGUAGE C VOLATILE STRICT;
45+
LANGUAGE C VOLATILE STRICT
46+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
4647

47-
-- COMMENTS
4848

4949
COMMENT ON FUNCTION _pgr_floydWarshall(TEXT, BOOLEAN)
5050
IS 'pgRouting internal function';

‎sql/allpairs/_johnson.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ CREATE FUNCTION _pgr_johnson(
4242
OUT agg_cost FLOAT)
4343
RETURNS SETOF RECORD AS
4444
'MODULE_PATHNAME'
45-
LANGUAGE C VOLATILE STRICT;
45+
LANGUAGE C VOLATILE STRICT
46+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
4647

47-
-- COMMENTS
4848

4949
COMMENT ON FUNCTION _pgr_johnson(TEXT, BOOLEAN)
5050
IS 'pgRouting internal function';

‎sql/allpairs/floydWarshall.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ $BODY$
4343
FROM _pgr_floydWarshall(_pgr_get_statement($1), $2);
4444

4545
$BODY$
46-
LANGUAGE SQL VOLATILE STRICT;
46+
LANGUAGE SQL VOLATILE STRICT
47+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
4748

48-
-- COMMENTS
4949

5050
COMMENT ON FUNCTION pgr_floydWarshall(TEXT, BOOLEAN)
5151
IS 'pgr_floydWarshall

‎sql/allpairs/johnson.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ $BODY$
4343
FROM _pgr_johnson(_pgr_get_statement($1), $2);
4444

4545
$BODY$
46-
LANGUAGE SQL VOLATILE STRICT;
46+
LANGUAGE SQL VOLATILE STRICT
47+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
4748

48-
-- COMMENTS
4949

5050
COMMENT ON FUNCTION pgr_johnson(TEXT, BOOLEAN)
5151
IS 'pgr_johnson

‎sql/astar/_astar.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ CREATE FUNCTION _pgr_astar(
6262
OUT agg_cost FLOAT)
6363
RETURNS SETOF RECORD AS
6464
'MODULE_PATHNAME'
65-
LANGUAGE c VOLATILE STRICT;
65+
LANGUAGE C VOLATILE STRICT
66+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
6667

6768

6869
--v3.2
@@ -86,9 +87,9 @@ CREATE FUNCTION _pgr_astar(
8687
OUT agg_cost FLOAT)
8788
RETURNS SETOF RECORD AS
8889
'MODULE_PATHNAME'
89-
LANGUAGE c VOLATILE STRICT;
90+
LANGUAGE C VOLATILE STRICT
91+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
9092

91-
-- COMMENTS
9293

9394
COMMENT ON FUNCTION _pgr_astar(TEXT, ANYARRAY, ANYARRAY, BOOLEAN, INTEGER, FLOAT, FLOAT, BOOLEAN, BOOLEAN)
9495
IS 'pgRouting internal function';

‎sql/astar/astar.sql‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ $BODY$
5858
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
5959
FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT);
6060
$BODY$
61-
LANGUAGE sql VOLATILE STRICT
62-
COST 100
63-
ROWS 1000;
61+
LANGUAGE SQL VOLATILE STRICT
62+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
6463

6564

6665
--v3.6
@@ -88,9 +87,8 @@ $BODY$
8887
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
8988
FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT);
9089
$BODY$
91-
LANGUAGE sql VOLATILE STRICT
92-
COST 100
93-
ROWS 1000;
90+
LANGUAGE SQL VOLATILE STRICT
91+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
9492

9593

9694
--v3.6
@@ -118,9 +116,8 @@ $BODY$
118116
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
119117
FROM _pgr_aStar(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, normal:=false);
120118
$BODY$
121-
LANGUAGE sql VOLATILE STRICT
122-
COST 100
123-
ROWS 1000;
119+
LANGUAGE SQL VOLATILE STRICT
120+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
124121

125122

126123
--v3.0
@@ -148,9 +145,8 @@ $BODY$
148145
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
149146
FROM _pgr_aStar(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT);
150147
$BODY$
151-
LANGUAGE sql VOLATILE STRICT
152-
COST 100
153-
ROWS 1000;
148+
LANGUAGE SQL VOLATILE STRICT
149+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
154150

155151

156152
--v3.2
@@ -177,12 +173,10 @@ $BODY$
177173
SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
178174
FROM _pgr_aStar(_pgr_get_statement($1), _pgr_get_statement($2), $3, $4, $5::FLOAT, $6::FLOAT);
179175
$BODY$
180-
LANGUAGE sql VOLATILE STRICT
181-
COST 100
182-
ROWS 1000;
176+
LANGUAGE SQL VOLATILE STRICT
177+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
183178

184179

185-
-- COMMENTS
186180

187181

188182
COMMENT ON FUNCTION pgr_aStar(TEXT, BIGINT, BIGINT, BOOLEAN, INTEGER, FLOAT, FLOAT)

‎sql/astar/astarCost.sql‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ $BODY$
5454
FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, true) AS a
5555
ORDER BY a.start_vid, a.end_vid;
5656
$BODY$
57-
LANGUAGE sql VOLATILE STRICT
58-
COST 100
59-
ROWS 1000;
57+
LANGUAGE SQL VOLATILE STRICT
58+
COST ${COST_HIGH} ROWS ${ROWS_LOW};
6059

6160

6261

@@ -80,9 +79,8 @@ $BODY$
8079
FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, true) AS a
8180
ORDER BY a.start_vid, a.end_vid;
8281
$BODY$
83-
LANGUAGE sql VOLATILE STRICT
84-
COST 100
85-
ROWS 1000;
82+
LANGUAGE SQL VOLATILE STRICT
83+
COST ${COST_HIGH} ROWS ${ROWS_LOW};
8684

8785

8886

@@ -106,9 +104,8 @@ $BODY$
106104
FROM _pgr_aStar(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, true, normal:=false) AS a
107105
ORDER BY a.start_vid, a.end_vid;
108106
$BODY$
109-
LANGUAGE sql VOLATILE STRICT
110-
COST 100
111-
ROWS 1000;
107+
LANGUAGE SQL VOLATILE STRICT
108+
COST ${COST_HIGH} ROWS ${ROWS_LOW};
112109

113110

114111
--v3.0
@@ -132,9 +129,8 @@ $BODY$
132129
FROM _pgr_aStar(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, true) AS a
133130
ORDER BY a.start_vid, a.end_vid;
134131
$BODY$
135-
LANGUAGE sql VOLATILE STRICT
136-
COST 100
137-
ROWS 1000;
132+
LANGUAGE SQL VOLATILE STRICT
133+
COST ${COST_HIGH} ROWS ${ROWS_LOW};
138134

139135

140136
--v3.2
@@ -157,12 +153,10 @@ $BODY$
157153
FROM _pgr_aStar(_pgr_get_statement($1), _pgr_get_statement($2), $3, $4, $5::FLOAT, $6::FLOAT, true) AS a
158154
ORDER BY a.start_vid, a.end_vid;
159155
$BODY$
160-
LANGUAGE sql VOLATILE STRICT
161-
COST 100
162-
ROWS 1000;
156+
LANGUAGE SQL VOLATILE STRICT
157+
COST ${COST_HIGH} ROWS ${ROWS_LOW};
163158

164159

165-
-- COMMENTS
166160

167161
COMMENT ON FUNCTION pgr_aStarCost(TEXT, BIGINT, BIGINT, BOOLEAN, INTEGER, FLOAT, FLOAT)
168162
IS 'pgr_aStarCost(One to One)

‎sql/astar/astarCostMatrix.sql‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ $BODY$
5151
SELECT a.start_vid, a.end_vid, a.agg_cost
5252
FROM _pgr_astar(_pgr_get_statement($1), $2, $2, $3, $4, $5::FLOAT, $6::FLOAT, true) a;
5353
$BODY$
54-
LANGUAGE SQL VOLATILE
55-
COST 100
56-
ROWS 1000;
54+
LANGUAGE SQL VOLATILE STRICT
55+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
5756

5857
-- COMMENT
5958

‎sql/bdAstar/_bdAstar.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ CREATE FUNCTION _pgr_bdAstar(
5353
OUT agg_cost FLOAT)
5454
RETURNS SETOF RECORD AS
5555
'MODULE_PATHNAME'
56-
LANGUAGE C VOLATILE STRICT;
56+
LANGUAGE C VOLATILE STRICT
57+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
5758

5859

5960
--v3.2
@@ -76,10 +77,10 @@ CREATE FUNCTION _pgr_bdAstar(
7677
OUT agg_cost FLOAT)
7778
RETURNS SETOF RECORD AS
7879
'MODULE_PATHNAME'
79-
LANGUAGE C VOLATILE STRICT;
80+
LANGUAGE C VOLATILE STRICT
81+
COST ${COST_HIGH} ROWS ${ROWS_HIGH};
8082

8183

82-
-- COMMENTS
8384

8485
COMMENT ON FUNCTION _pgr_bdAstar(TEXT, ANYARRAY, ANYARRAY, BOOLEAN, INTEGER, FLOAT, FLOAT, BOOLEAN)
8586
IS 'pgRouting internal function';

0 commit comments

Comments
 (0)