cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed cached (won't work between sessions)

Browse Source
This commit is contained in:
Juan Ignacio Sánchez Lara 2015-08-20 12:55:22 +02:00
parent bd31419e94
commit 43d41e5c26
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scripts-available/CDB_Conf.sql
View File

@ -13,11 +13,11 @@ END
$$; $$;
CREATE OR REPLACE CREATE OR REPLACE
FUNCTION cartodb.CDB_Conf_SetConf(key TEXT, value JSON) FUNCTION cartodb.CDB_Conf_SetConf(key text, value JSON)
RETURNS void AS $$ RETURNS void AS $$
BEGIN BEGIN
PERFORM cartodb.CDB_Conf_RemoveConf(key); PERFORM cartodb.CDB_Conf_RemoveConf(key);
EXECUTE 'INSERT INTO cartodb.CDB_CONF (KEY, VALUE) VALUES ($1, $2);' USING key, value; EXECUTE 'INSERT INTO CDB_CONF (KEY, VALUE) VALUES ($1, $2);' USING key, value;
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@ -25,8 +25,7 @@ CREATE OR REPLACE
FUNCTION cartodb.CDB_Conf_RemoveConf(key text) FUNCTION cartodb.CDB_Conf_RemoveConf(key text)
RETURNS void AS $$ RETURNS void AS $$
BEGIN BEGIN
PERFORM cartodb._CDB_Conf_Cache('remove', key); EXECUTE 'DELETE FROM CDB_CONF WHERE KEY = $1;' USING key;
EXECUTE 'DELETE FROM cartodb.CDB_CONF WHERE KEY = $1;' USING key;
END END
$$ LANGUAGE PLPGSQL VOLATILE; $$ LANGUAGE PLPGSQL VOLATILE;
@ -36,31 +35,7 @@ FUNCTION cartodb.CDB_Conf_GetConf(key text)
DECLARE DECLARE
value JSON; value JSON;
BEGIN BEGIN
EXECUTE 'select cartodb._CDB_Conf_Cache(''get'', $1);' INTO value USING key; EXECUTE 'SELECT VALUE FROM CDB_CONF WHERE KEY = $1;' INTO value USING key;
RETURN value; RETURN value;
END END
$$ LANGUAGE PLPGSQL STABLE; $$ LANGUAGE PLPGSQL STABLE;
-- Single cache function allowing SD private dict usage
CREATE OR REPLACE
FUNCTION cartodb._CDB_Conf_Cache(operation text, key text)
RETURNS JSON AS
$$
if 'conf' not in SD:
SD['conf'] = {}
if operation == 'remove':
if key in SD['conf']:
del(SD['conf'][key])
elif operation == 'get':
if key not in SD['conf'] or SD['conf'][key] == None:
value = None
# Execute returns string, not json :(
response = plpy.execute("SELECT value FROM cartodb.CDB_CONF WHERE KEY = '%s'" % key);
if len(response) > 0:
value = response[0]['value']
SD['conf'][key] = value
return SD['conf'][key]
else:
raise Exception('Unknown operation: %s' % operation)
$$ LANGUAGE 'plpythonu' VOLATILE;