From d96a0ef55c6de851369bd0a562caf349d4435c75 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Thu, 7 Aug 2014 12:15:15 -0400 Subject: storagemanager: When map store isn't available, fallback to keyval store [backported from trunk] --- core/storagemanager.lua | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'core/storagemanager.lua') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index c312cf05..39eae120 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -99,11 +99,47 @@ local function get_driver(host, store) return driver, driver_name; end -local function open(host, store, typ) +local map_shim_mt = { + __index = { + get = function(self, username, key) + local ret, err = self.keyval_store:get(username); + if ret == nil and err then return nil, err end + return ret[key]; + end; + set = function(self, username, key, data) + local current, err = self.keyval_store:get(username); + if current == nil then + if err then + return nil, err; + else + current = {}; + end + end + current[key] = data; + return self.keyval_store:set(username, current); + end; + }; +} + +local open; + +local function create_map_shim(host, store) + local keyval_store, err = open(host, store, "keyval"); + if keyval_store == nil then return nil, err end + return setmetatable({ + keyval_store = keyval_store; + }, map_shim_mt); +end + +function open(host, store, typ) local driver, driver_name = get_driver(host, store); local ret, err = driver:open(store, typ); if not ret then if err == "unsupported-store" then + if typ == "map" then -- Use shim on top of keyval store + log("debug", "map storage driver unavailable, using shim on top of keyval store."); + return create_map_shim(host, store); + end log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver", driver_name, store, typ or ""); ret = null_storage_driver; -- cgit v1.2.3 From 07aeb61310bc5187677798f0fcf38e4241ddaae6 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 8 Aug 2014 12:38:35 +0200 Subject: storagemanager: Fix map store shim if store is empty --- core/storagemanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/storagemanager.lua') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 39eae120..cf2c65d5 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -103,7 +103,7 @@ local map_shim_mt = { __index = { get = function(self, username, key) local ret, err = self.keyval_store:get(username); - if ret == nil and err then return nil, err end + if ret == nil then return nil, err end return ret[key]; end; set = function(self, username, key, data) -- cgit v1.2.3 From 38cee98c50dbbddd39cfd2cc91370807d22323a3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 9 Feb 2016 16:54:56 +0100 Subject: storagemanager: Add set_keys method to map store shim --- core/storagemanager.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'core/storagemanager.lua') diff --git a/core/storagemanager.lua b/core/storagemanager.lua index cf2c65d5..4f04e594 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -118,6 +118,23 @@ local map_shim_mt = { current[key] = data; return self.keyval_store:set(username, current); end; + set_keys = function (self, username, keydatas) + local current, err = self.keyval_store:get(username); + if current == nil then + if err then + return nil, err; + else + current = keydatas; + end + else + for k,v in pairs(keydatas) do + if v == self.remove then v = nil; end + current[k] = v; + end + end + return self.keyval_store:set(username, current); + end; + remove = {}; }; } -- cgit v1.2.3