Merge 0.10->trunk

[prosody.git] / core / storagemanager.lua

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 5a7bb7bd6e716855aea8651eb0c6d9de5b0f30e7..b2ad29d02e9a51f7bbd0e34698fc676089ff47ce 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -37,7 +37,7 @@ function initialize_host(host)
                local item = event.item;
                stores_available:set(host, item.name, item);
        end);
-       
+
        host_session.events.add_handler("item-removed/storage-provider", function (event)
                local item = event.item;
                stores_available:set(host, item.name, nil);
@@ -70,7 +70,7 @@ function get_driver(host, store)
        if not driver_name then
                driver_name = config.get(host, "default_storage") or "internal";
        end
-       
+
        local driver = load_driver(host, driver_name);
        if not driver then
                log("warn", "Falling back to null driver for %s storage on %s", store, host);
@@ -80,13 +80,46 @@ function get_driver(host, store)
        return driver, driver_name;
 end
 
+local map_shim_mt = {
+       __index = {
+               get = function(self, username, key)
+                       local ret, err = self.keyval_store:get(username);
+                       if ret == nil 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 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);
+                               driver_name, store, typ or "<nil>");
                        ret = null_storage_driver;
                        err = nil;
                end
@@ -118,6 +151,13 @@ end
 function datamanager.store(username, host, datastore, data)
        return open(host, datastore):set(username, data);
 end
+function datamanager.users(host, datastore, typ)
+       local driver = open(host, datastore, typ);
+       if not driver.users then
+               return function() log("warn", "storage driver %s does not support listing users", driver.name) end
+       end
+       return driver:users();
+end
 function datamanager.stores(username, host, typ)
        return get_driver(host):stores(username, typ);
 end