Revert internal geocoder related stuff #302

This reverts commits 579d11e, 4af5975 and a2da597
This commit is contained in:
Rafa de la Torre
2016-11-24 17:33:06 +01:00
parent f07d2f9302
commit 4c75c5f261
2 changed files with 2 additions and 31 deletions

View File

@@ -85,18 +85,6 @@ RETURNS SETOF cdb_dataservices_server.service_params AS $$
provider = user_obs_config.provider
ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
#-- Internal geocoder
service = 'internal_geocoder'
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)]
user_service = UserMetricsService(user_geocoder_config, redis_conn)
monthly_quota = user_geocoder_config.monthly_quota
used_quota = user_service.used_quota(user_geocoder_config.service_type, today)
soft_limit = user_geocoder_config.soft_limit
provider = user_geocoder_config.provider
ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
return ret
$$ LANGUAGE plpythonu;
@@ -113,8 +101,6 @@ returns BOOLEAN AS $$
SELECT * INTO params
FROM cdb_dataservices_server.cdb_service_params(username, orgname) AS p
WHERE p.service = service_;
RETURN params.soft_limit
OR params.monthly_quota IS NULL -- account for the internal_geocoder
OR ((params.used_quota + input_size) <= params.monthly_quota);
RETURN params.soft_limit OR ((params.used_quota + input_size) <= params.monthly_quota);
END
$$ LANGUAGE plpgsql;

View File

@@ -281,13 +281,11 @@ class IsolinesRoutingConfig(ServiceConfig):
class InternalGeocoderConfig(ServiceConfig):
METRICS_LOG_KEY = 'geocoder_log_path'
PERIOD_END_DATE = 'period_end_date'
def __init__(self, redis_connection, db_conn, username, orgname=None):
# For now, internal geocoder doesn't use the redis config
super(InternalGeocoderConfig, self).__init__(redis_connection, db_conn,
super(InternalGeocoderConfig, self).__init__(None, db_conn,
username, orgname)
self._period_end_date = date_parse(self._redis_config[self.PERIOD_END_DATE])
@property
def service_type(self):
@@ -305,23 +303,10 @@ class InternalGeocoderConfig(ServiceConfig):
def geocoding_quota(self):
return None
@property
def monthly_quota(self):
return None
@property
def provider(self):
return 'internal'
@property
def period_end_date(self):
return self._period_end_date
@property
def soft_limit(self):
return False
class GeocoderConfig(ServiceConfig):