User config helper for internal geocoder too

2016-03-17 11:48:25 +01:00
parent b9f18dda69
commit 0f262510b2
8 changed files with 76 additions and 22 deletions
--- a/server/extension/sql/0.5.1/15_config_helper.sql
+++ b/server/extension/sql/0.5.1/15_config_helper.sql
@@ -13,6 +13,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 $$
--- a/server/extension/sql/0.5.1/30_admin0.sql
+++ b/server/extension/sql/0.5.1/30_admin0.sql
@@ -5,7 +5,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:
--- a/server/extension/sql/0.5.1/40_admin1.sql
+++ b/server/extension/sql/0.5.1/40_admin1.sql
@@ -6,7 +6,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:
@@ -38,7 +39,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:
--- a/server/extension/sql/0.5.1/50_namedplaces.sql
+++ b/server/extension/sql/0.5.1/50_namedplaces.sql
@@ -6,7 +6,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:
@@ -38,7 +39,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:
@@ -70,7 +72,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:
--- a/server/extension/sql/0.5.1/60_postalcodes.sql
+++ b/server/extension/sql/0.5.1/60_postalcodes.sql
@@ -5,7 +5,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:
@@ -36,7 +37,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:
@@ -67,7 +69,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:
@@ -98,7 +101,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:
--- a/server/extension/sql/0.5.1/70_ips.sql
+++ b/server/extension/sql/0.5.1/70_ips.sql
@@ -5,7 +5,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: