cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Redis structure for services

Browse Source
This commit is contained in:
Mario de Frutos
2015-11-17 18:02:21 +01:00
parent 928e33b489
commit 9e30bf2223
9 changed files with 207 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/extension/sql/0.0.1/10_redis_helper.sql
View File

@@ -25,7 +25,7 @@ RETURNS cdb_geocoder_server._redis_conf_params AS $$
$$ LANGUAGE plpythonu;
-- Get the connection to redis from cache or create a new one
CREATE OR REPLACE FUNCTION cdb_geocoder_server._connect_to_redis(user_id name)
CREATE OR REPLACE FUNCTION cdb_geocoder_server._connect_to_redis(user_id text)
RETURNS boolean AS $$
if user_id in GD and 'redis_connection' in GD[user_id]:
return False

22
server/extension/sql/0.0.1/30_admin0.sql
View File

@@ -1,8 +1,7 @@
-- Interface of the server extension
CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygon(user_id name, tx_id bigint, country_name text)
CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygon(user_id name, user_config_data JSON, geocoder_config_data JSON, country_name text)
RETURNS Geometry AS $$
from cartodb_geocoder import quota_service
plpy.debug('Entering geocode_admin0_polygons')
plpy.debug('user_id = %s' % user_id)
@@ -12,23 +11,14 @@ RETURNS Geometry AS $$
plpy.error('The api_key must be provided')
#--TODO: rate limiting check
#--This will create and cache a redis connection, if needed, in the GD object for the current user
redis_conn_plan = plpy.prepare("SELECT cdb_geocoder_server._connect_to_redis($1)", ["name"])
redis_conn_result = plpy.execute(redis_conn_plan, [user_id], 1)
qs = quota_service.QuotaService(user_id, tx_id, GD[user_id]['redis_connection'])
if not qs.check_user_quota():
plpy.error("Not enough quota for this user")
#--TODO: quota check
#-- Copied from the doc, see http://www.postgresql.org/docs/9.4/static/plpython-database.html
plan = plpy.prepare("SELECT cdb_geocoder_server._geocode_admin0_polygon($1) AS mypolygon", ["text"])
result = plpy.execute(plan, [country_name], 1)
if result.status() == 5 and result.nrows() == 1:
qs.increment_geocoder_use()
plpy.debug('Returning from geocode_admin0_polygons')
return result[0]["mypolygon"]
else:
plpy.error('Something wrong with the georefence operation')
rv = plpy.execute(plan, [country_name], 1)
plpy.debug('Returning from Returning from geocode_admin0_polygons')
return rv[0]["mypolygon"]
$$ LANGUAGE plpythonu;