From 3a240bf6ad40631d47bceb697dce5e9081886430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Fri, 27 Apr 2018 12:43:29 +0200 Subject: [PATCH] params at routing metrics --- .../extension/cdb_dataservices_server--0.30.5--0.31.0.sql | 8 ++++++-- server/extension/cdb_dataservices_server--0.31.0.sql | 8 ++++++-- server/extension/sql/105_route_between_points.sql | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/server/extension/cdb_dataservices_server--0.30.5--0.31.0.sql b/server/extension/cdb_dataservices_server--0.30.5--0.31.0.sql index 040af68..cf67925 100644 --- a/server/extension/cdb_dataservices_server--0.30.5--0.31.0.sql +++ b/server/extension/cdb_dataservices_server--0.30.5--0.31.0.sql @@ -85,7 +85,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_point', user_routing_config, logger): + params = {'origin': origin, 'destination': destination, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_point', user_routing_config, logger, params): waypoints = [origin, destination] if user_routing_config.mapzen_provider: @@ -124,7 +126,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_waypoints', user_routing_config, logger): + params = {'waypoints': waypoints, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_waypoints', user_routing_config, logger, params): if user_routing_config.mapzen_provider: mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._cdb_mapzen_route_with_waypoints($1, $2, $3, $4) as route;", ["text", "text", "geometry(Point, 4326)[]", "text"]) result = plpy.execute(mapzen_plan, [username, orgname, waypoints, mode]) diff --git a/server/extension/cdb_dataservices_server--0.31.0.sql b/server/extension/cdb_dataservices_server--0.31.0.sql index a62e503..2e7b27c 100644 --- a/server/extension/cdb_dataservices_server--0.31.0.sql +++ b/server/extension/cdb_dataservices_server--0.31.0.sql @@ -209,7 +209,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_point', user_routing_config, logger): + params = {'origin': origin, 'destination': destination, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_point', user_routing_config, logger, params): waypoints = [origin, destination] if user_routing_config.mapzen_provider: @@ -248,7 +250,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_waypoints', user_routing_config, logger): + params = {'waypoints': waypoints, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_waypoints', user_routing_config, logger, params): if user_routing_config.mapzen_provider: mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._cdb_mapzen_route_with_waypoints($1, $2, $3, $4) as route;", ["text", "text", "geometry(Point, 4326)[]", "text"]) result = plpy.execute(mapzen_plan, [username, orgname, waypoints, mode]) diff --git a/server/extension/sql/105_route_between_points.sql b/server/extension/sql/105_route_between_points.sql index 841ef39..87769c9 100644 --- a/server/extension/sql/105_route_between_points.sql +++ b/server/extension/sql/105_route_between_points.sql @@ -18,7 +18,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_point', user_routing_config, logger): + params = {'origin': origin, 'destination': destination, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_point', user_routing_config, logger, params): waypoints = [origin, destination] if user_routing_config.mapzen_provider: @@ -57,7 +59,9 @@ RETURNS cdb_dataservices_server.simple_route AS $$ logger_config = GD["logger_config"] logger = Logger(logger_config) - with metrics('cdb_route_with_waypoints', user_routing_config, logger): + params = {'waypoints': waypoints, 'mode': mode, 'options': options, 'units': units} + + with metrics('cdb_route_with_waypoints', user_routing_config, logger, params): if user_routing_config.mapzen_provider: mapzen_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._cdb_mapzen_route_with_waypoints($1, $2, $3, $4) as route;", ["text", "text", "geometry(Point, 4326)[]", "text"]) result = plpy.execute(mapzen_plan, [username, orgname, waypoints, mode])