Full 0.5.1 server file updated

server/extension/cdb_dataservices_server--0.5.1.sql

@@ -107,6 +107,21 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 
+-- Get the Redis configuration from the _conf table --
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_internal_geocoder_config(username text, orgname text)
+RETURNS boolean AS $$
+  cache_key = "user_internal_geocoder_config_{0}".format(username)
+  if cache_key in GD:
+    return False
+  else:
+    from cartodb_services.metrics import InternalGeocoderConfig
+    plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
+    redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
+    geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    GD[cache_key] = geocoder_config
+    return True
+$$ LANGUAGE plpythonu SECURITY DEFINER;
+
 -- Get the Redis configuration from the _conf table --
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_isolines_routing_config(username text, orgname text)
 RETURNS boolean AS $$
@@ -227,7 +242,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -278,7 +294,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -310,7 +327,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -395,7 +413,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -427,7 +446,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -459,7 +479,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -558,7 +579,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -589,7 +611,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -620,7 +643,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -651,7 +675,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try:
@@ -777,7 +802,8 @@ RETURNS Geometry AS $$
 
     plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
-    user_geocoder_config = InternalGeocoderConfig(redis_conn, plpy, username, orgname)
+    plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
+    user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
 
     quota_service = QuotaService(user_geocoder_config, redis_conn)
     try: