mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-02 21:17:12 +02:00
Implement cache for mod_private
This commit is contained in:
parent
d88e4d495f
commit
3a96d72a7f
|
@ -37,21 +37,27 @@
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("logger.hrl").
|
-include("logger.hrl").
|
||||||
|
|
||||||
-include("xmpp.hrl").
|
-include("xmpp.hrl").
|
||||||
-include("mod_private.hrl").
|
-include("mod_private.hrl").
|
||||||
|
|
||||||
|
-define(PRIVATE_CACHE, private_cache).
|
||||||
|
|
||||||
-callback init(binary(), gen_mod:opts()) -> any().
|
-callback init(binary(), gen_mod:opts()) -> any().
|
||||||
-callback import(binary(), binary(), [binary()]) -> ok.
|
-callback import(binary(), binary(), [binary()]) -> ok.
|
||||||
-callback set_data(binary(), binary(), [{binary(), xmlel()}]) -> {atomic, any()}.
|
-callback set_data(binary(), binary(), [{binary(), xmlel()}]) -> ok | {error, any()}.
|
||||||
-callback get_data(binary(), binary(), binary()) -> {ok, xmlel()} | error.
|
-callback get_data(binary(), binary(), binary()) -> {ok, xmlel()} | error | {error, any()}.
|
||||||
-callback get_all_data(binary(), binary()) -> [xmlel()].
|
-callback get_all_data(binary(), binary()) -> {ok, [xmlel()]} | error | {error, any()}.
|
||||||
-callback remove_user(binary(), binary()) -> any().
|
-callback del_data(binary(), binary()) -> ok | {error, any()}.
|
||||||
|
-callback use_cache(binary()) -> boolean().
|
||||||
|
-callback cache_nodes(binary()) -> [node()].
|
||||||
|
|
||||||
|
-optional_callbacks([use_cache/1, cache_nodes/1]).
|
||||||
|
|
||||||
start(Host, Opts) ->
|
start(Host, Opts) ->
|
||||||
IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
|
IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
|
||||||
Mod = gen_mod:db_mod(Host, Opts, ?MODULE),
|
Mod = gen_mod:db_mod(Host, Opts, ?MODULE),
|
||||||
Mod:init(Host, Opts),
|
Mod:init(Host, Opts),
|
||||||
|
init_cache(Mod, Host, Opts),
|
||||||
ejabberd_hooks:add(remove_user, Host, ?MODULE,
|
ejabberd_hooks:add(remove_user, Host, ?MODULE,
|
||||||
remove_user, 50),
|
remove_user, 50),
|
||||||
gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
|
gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
|
||||||
|
@ -71,6 +77,7 @@ reload(Host, NewOpts, OldOpts) ->
|
||||||
true ->
|
true ->
|
||||||
ok
|
ok
|
||||||
end,
|
end,
|
||||||
|
init_cache(NewMod, Host, NewOpts),
|
||||||
case gen_mod:is_equal_opt(iqdisc, NewOpts, OldOpts, gen_iq_handler:iqdisc(Host)) of
|
case gen_mod:is_equal_opt(iqdisc, NewOpts, OldOpts, gen_iq_handler:iqdisc(Host)) of
|
||||||
{false, IQDisc, _} ->
|
{false, IQDisc, _} ->
|
||||||
gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_PRIVATE,
|
gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_PRIVATE,
|
||||||
|
@ -89,11 +96,23 @@ process_sm_iq(#iq{type = Type, lang = Lang,
|
||||||
Txt = <<"No private data found in this query">>,
|
Txt = <<"No private data found in this query">>,
|
||||||
xmpp:make_error(IQ, xmpp:err_bad_request(Txt, Lang));
|
xmpp:make_error(IQ, xmpp:err_bad_request(Txt, Lang));
|
||||||
Data when Type == set ->
|
Data when Type == set ->
|
||||||
set_data(LUser, LServer, Data),
|
case set_data(LUser, LServer, Data) of
|
||||||
xmpp:make_iq_result(IQ);
|
ok ->
|
||||||
|
xmpp:make_iq_result(IQ);
|
||||||
|
{error, _} ->
|
||||||
|
Txt = <<"Database failure">>,
|
||||||
|
Err = xmpp:err_internal_server_error(Txt, Lang),
|
||||||
|
xmpp:make_error(IQ, Err)
|
||||||
|
end;
|
||||||
Data when Type == get ->
|
Data when Type == get ->
|
||||||
StorageEls = get_data(LUser, LServer, Data),
|
case get_data(LUser, LServer, Data) of
|
||||||
xmpp:make_iq_result(IQ, #private{xml_els = StorageEls})
|
{error, _} ->
|
||||||
|
Txt = <<"Database failure">>,
|
||||||
|
Err = xmpp:err_internal_server_error(Txt, Lang),
|
||||||
|
xmpp:make_error(IQ, Err);
|
||||||
|
Els ->
|
||||||
|
xmpp:make_iq_result(IQ, #private{xml_els = Els})
|
||||||
|
end
|
||||||
end;
|
end;
|
||||||
process_sm_iq(#iq{lang = Lang} = IQ) ->
|
process_sm_iq(#iq{lang = Lang} = IQ) ->
|
||||||
Txt = <<"Query to another users is forbidden">>,
|
Txt = <<"Query to another users is forbidden">>,
|
||||||
|
@ -109,35 +128,124 @@ filter_xmlels(Els) ->
|
||||||
end
|
end
|
||||||
end, Els).
|
end, Els).
|
||||||
|
|
||||||
-spec set_data(binary(), binary(), [{binary(), xmlel()}]) -> {atomic, any()}.
|
-spec set_data(binary(), binary(), [{binary(), xmlel()}]) -> ok | {error, _}.
|
||||||
set_data(LUser, LServer, Data) ->
|
set_data(LUser, LServer, Data) ->
|
||||||
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
||||||
Mod:set_data(LUser, LServer, Data).
|
case Mod:set_data(LUser, LServer, Data) of
|
||||||
|
ok ->
|
||||||
|
delete_cache(Mod, LServer, LServer, Data);
|
||||||
|
{error, _} = Err ->
|
||||||
|
Err
|
||||||
|
end.
|
||||||
|
|
||||||
-spec get_data(binary(), binary(), [{binary(), xmlel()}]) -> [xmlel()].
|
-spec get_data(binary(), binary(), [{binary(), xmlel()}]) -> [xmlel()] | {error, _}.
|
||||||
get_data(LUser, LServer, Data) ->
|
get_data(LUser, LServer, Data) ->
|
||||||
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
||||||
lists:map(
|
lists:foldr(
|
||||||
fun({NS, El}) ->
|
fun(_, {error, _} = Err) ->
|
||||||
case Mod:get_data(LUser, LServer, NS) of
|
Err;
|
||||||
|
({NS, El}, Els) ->
|
||||||
|
Res = case use_cache(Mod, LServer) of
|
||||||
|
true ->
|
||||||
|
ets_cache:lookup(
|
||||||
|
?PRIVATE_CACHE, {LUser, LServer, NS},
|
||||||
|
fun() -> Mod:get_data(LUser, LServer, NS) end);
|
||||||
|
false ->
|
||||||
|
Mod:get_data(LUser, LServer, NS)
|
||||||
|
end,
|
||||||
|
case Res of
|
||||||
{ok, StorageEl} ->
|
{ok, StorageEl} ->
|
||||||
StorageEl;
|
[StorageEl|Els];
|
||||||
error ->
|
error ->
|
||||||
El
|
[El|Els];
|
||||||
|
{error, _} = Err ->
|
||||||
|
Err
|
||||||
end
|
end
|
||||||
end, Data).
|
end, [], Data).
|
||||||
|
|
||||||
-spec get_data(binary(), binary()) -> [xmlel()].
|
-spec get_data(binary(), binary()) -> [xmlel()] | {error, _}.
|
||||||
get_data(LUser, LServer) ->
|
get_data(LUser, LServer) ->
|
||||||
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
Mod = gen_mod:db_mod(LServer, ?MODULE),
|
||||||
Mod:get_all_data(LUser, LServer).
|
case Mod:get_all_data(LUser, LServer) of
|
||||||
|
{ok, Els} -> Els;
|
||||||
|
error -> [];
|
||||||
|
{error, _} = Err -> Err
|
||||||
|
end.
|
||||||
|
|
||||||
-spec remove_user(binary(), binary()) -> any().
|
-spec remove_user(binary(), binary()) -> ok.
|
||||||
remove_user(User, Server) ->
|
remove_user(User, Server) ->
|
||||||
LUser = jid:nodeprep(User),
|
LUser = jid:nodeprep(User),
|
||||||
LServer = jid:nameprep(Server),
|
LServer = jid:nameprep(Server),
|
||||||
Mod = gen_mod:db_mod(Server, ?MODULE),
|
Mod = gen_mod:db_mod(Server, ?MODULE),
|
||||||
Mod:remove_user(LUser, LServer).
|
Data = case use_cache(Mod, LServer) of
|
||||||
|
true ->
|
||||||
|
case Mod:get_all_data(LUser, LServer) of
|
||||||
|
{ok, Els} -> filter_xmlels(Els);
|
||||||
|
_ -> []
|
||||||
|
end;
|
||||||
|
false ->
|
||||||
|
[]
|
||||||
|
end,
|
||||||
|
Mod:del_data(LUser, LServer),
|
||||||
|
delete_cache(Mod, LUser, LServer, Data).
|
||||||
|
|
||||||
|
-spec delete_cache(module(), binary(), binary(), [{binary(), xmlel()}]) -> ok.
|
||||||
|
delete_cache(Mod, LUser, LServer, Data) ->
|
||||||
|
case use_cache(Mod, LServer) of
|
||||||
|
true ->
|
||||||
|
Nodes = cache_nodes(Mod, LServer),
|
||||||
|
lists:foreach(
|
||||||
|
fun({NS, _}) ->
|
||||||
|
ets_cache:delete(?PRIVATE_CACHE,
|
||||||
|
{LUser, LServer, NS},
|
||||||
|
Nodes)
|
||||||
|
end, Data);
|
||||||
|
false ->
|
||||||
|
ok
|
||||||
|
end.
|
||||||
|
|
||||||
|
-spec init_cache(module(), binary(), gen_mod:opts()) -> ok.
|
||||||
|
init_cache(Mod, Host, Opts) ->
|
||||||
|
case use_cache(Mod, Host) of
|
||||||
|
true ->
|
||||||
|
CacheOpts = cache_opts(Host, Opts),
|
||||||
|
ets_cache:new(?PRIVATE_CACHE, CacheOpts);
|
||||||
|
false ->
|
||||||
|
ets_cache:delete(?PRIVATE_CACHE)
|
||||||
|
end.
|
||||||
|
|
||||||
|
-spec cache_opts(binary(), gen_mod:opts()) -> [proplists:property()].
|
||||||
|
cache_opts(Host, Opts) ->
|
||||||
|
MaxSize = gen_mod:get_opt(
|
||||||
|
cache_size, Opts,
|
||||||
|
ejabberd_config:cache_size(Host)),
|
||||||
|
CacheMissed = gen_mod:get_opt(
|
||||||
|
cache_missed, Opts,
|
||||||
|
ejabberd_config:cache_missed(Host)),
|
||||||
|
LifeTime = case gen_mod:get_opt(
|
||||||
|
cache_life_time, Opts,
|
||||||
|
ejabberd_config:cache_life_time(Host)) of
|
||||||
|
infinity -> infinity;
|
||||||
|
I -> timer:seconds(I)
|
||||||
|
end,
|
||||||
|
[{max_size, MaxSize}, {cache_missed, CacheMissed}, {life_time, LifeTime}].
|
||||||
|
|
||||||
|
-spec use_cache(module(), binary()) -> boolean().
|
||||||
|
use_cache(Mod, Host) ->
|
||||||
|
case erlang:function_exported(Mod, use_cache, 1) of
|
||||||
|
true -> Mod:use_cache(Host);
|
||||||
|
false ->
|
||||||
|
gen_mod:get_module_opt(
|
||||||
|
Host, ?MODULE, use_cache,
|
||||||
|
ejabberd_config:use_cache(Host))
|
||||||
|
end.
|
||||||
|
|
||||||
|
-spec cache_nodes(module(), binary()) -> [node()].
|
||||||
|
cache_nodes(Mod, Host) ->
|
||||||
|
case erlang:function_exported(Mod, cache_nodes, 1) of
|
||||||
|
true -> Mod:cache_nodes(Host);
|
||||||
|
false -> ejabberd_cluster:get_nodes()
|
||||||
|
end.
|
||||||
|
|
||||||
import_info() ->
|
import_info() ->
|
||||||
[{<<"private_storage">>, 4}].
|
[{<<"private_storage">>, 4}].
|
||||||
|
@ -159,4 +267,11 @@ depends(_Host, _Opts) ->
|
||||||
|
|
||||||
mod_opt_type(db_type) -> fun(T) -> ejabberd_config:v_db(?MODULE, T) end;
|
mod_opt_type(db_type) -> fun(T) -> ejabberd_config:v_db(?MODULE, T) end;
|
||||||
mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1;
|
mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1;
|
||||||
mod_opt_type(_) -> [db_type, iqdisc].
|
mod_opt_type(O) when O == cache_life_time; O == cache_size ->
|
||||||
|
fun (I) when is_integer(I), I > 0 -> I;
|
||||||
|
(infinity) -> infinity
|
||||||
|
end;
|
||||||
|
mod_opt_type(O) when O == use_cache; O == cache_missed ->
|
||||||
|
fun (B) when is_boolean(B) -> B end;
|
||||||
|
mod_opt_type(_) ->
|
||||||
|
[db_type, iqdisc, cache_life_time, cache_size, use_cache, cache_missed].
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
-behaviour(mod_private).
|
-behaviour(mod_private).
|
||||||
|
|
||||||
%% API
|
%% API
|
||||||
-export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
|
-export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
|
||||||
import/3]).
|
use_cache/1, import/3]).
|
||||||
-export([need_transform/1, transform/1]).
|
-export([need_transform/1, transform/1]).
|
||||||
|
|
||||||
-include("xmpp.hrl").
|
-include("xmpp.hrl").
|
||||||
|
@ -43,6 +43,16 @@ init(_Host, _Opts) ->
|
||||||
[{disc_only_copies, [node()]},
|
[{disc_only_copies, [node()]},
|
||||||
{attributes, record_info(fields, private_storage)}]).
|
{attributes, record_info(fields, private_storage)}]).
|
||||||
|
|
||||||
|
use_cache(Host) ->
|
||||||
|
case mnesia:table_info(private_storage, storage_type) of
|
||||||
|
disc_only_copies ->
|
||||||
|
gen_mod:get_module_opt(
|
||||||
|
Host, mod_private, use_cache,
|
||||||
|
ejabberd_config:use_cache(Host));
|
||||||
|
_ ->
|
||||||
|
false
|
||||||
|
end.
|
||||||
|
|
||||||
set_data(LUser, LServer, Data) ->
|
set_data(LUser, LServer, Data) ->
|
||||||
F = fun () ->
|
F = fun () ->
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
|
@ -53,7 +63,7 @@ set_data(LUser, LServer, Data) ->
|
||||||
xml = Xmlel})
|
xml = Xmlel})
|
||||||
end, Data)
|
end, Data)
|
||||||
end,
|
end,
|
||||||
mnesia:transaction(F).
|
transaction(F).
|
||||||
|
|
||||||
get_data(LUser, LServer, XmlNS) ->
|
get_data(LUser, LServer, XmlNS) ->
|
||||||
case mnesia:dirty_read(private_storage, {LUser, LServer, XmlNS}) of
|
case mnesia:dirty_read(private_storage, {LUser, LServer, XmlNS}) of
|
||||||
|
@ -64,13 +74,18 @@ get_data(LUser, LServer, XmlNS) ->
|
||||||
end.
|
end.
|
||||||
|
|
||||||
get_all_data(LUser, LServer) ->
|
get_all_data(LUser, LServer) ->
|
||||||
lists:flatten(
|
case lists:flatten(
|
||||||
mnesia:dirty_select(private_storage,
|
mnesia:dirty_select(private_storage,
|
||||||
[{#private_storage{usns = {LUser, LServer, '_'},
|
[{#private_storage{usns = {LUser, LServer, '_'},
|
||||||
xml = '$1'},
|
xml = '$1'},
|
||||||
[], ['$1']}])).
|
[], ['$1']}])) of
|
||||||
|
[] ->
|
||||||
|
error;
|
||||||
|
Res ->
|
||||||
|
{ok, Res}
|
||||||
|
end.
|
||||||
|
|
||||||
remove_user(LUser, LServer) ->
|
del_data(LUser, LServer) ->
|
||||||
F = fun () ->
|
F = fun () ->
|
||||||
Namespaces = mnesia:select(private_storage,
|
Namespaces = mnesia:select(private_storage,
|
||||||
[{#private_storage{usns =
|
[{#private_storage{usns =
|
||||||
|
@ -86,7 +101,7 @@ remove_user(LUser, LServer) ->
|
||||||
end,
|
end,
|
||||||
Namespaces)
|
Namespaces)
|
||||||
end,
|
end,
|
||||||
mnesia:transaction(F).
|
transaction(F).
|
||||||
|
|
||||||
import(LServer, <<"private_storage">>,
|
import(LServer, <<"private_storage">>,
|
||||||
[LUser, XMLNS, XML, _TimeStamp]) ->
|
[LUser, XMLNS, XML, _TimeStamp]) ->
|
||||||
|
@ -110,3 +125,11 @@ transform(#private_storage{usns = {U, S, NS}, xml = El} = R) ->
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% Internal functions
|
%%% Internal functions
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
|
transaction(F) ->
|
||||||
|
case mnesia:transaction(F) of
|
||||||
|
{atomic, Res} ->
|
||||||
|
Res;
|
||||||
|
{aborted, Reason} ->
|
||||||
|
?ERROR_MSG("Mnesia transaction failed: ~p", [Reason]),
|
||||||
|
{error, db_failure}
|
||||||
|
end.
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
-behaviour(mod_private).
|
-behaviour(mod_private).
|
||||||
|
|
||||||
%% API
|
%% API
|
||||||
-export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
|
-export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
|
||||||
import/3]).
|
import/3]).
|
||||||
|
|
||||||
-include("xmpp.hrl").
|
-include("xmpp.hrl").
|
||||||
|
@ -40,37 +40,42 @@ init(_Host, _Opts) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
set_data(LUser, LServer, Data) ->
|
set_data(LUser, LServer, Data) ->
|
||||||
lists:foreach(
|
lists:foldl(
|
||||||
fun({XMLNS, El}) ->
|
fun(_, {error, _} = Err) ->
|
||||||
|
Err;
|
||||||
|
({XMLNS, El}, _) ->
|
||||||
ejabberd_riak:put(#private_storage{usns = {LUser, LServer, XMLNS},
|
ejabberd_riak:put(#private_storage{usns = {LUser, LServer, XMLNS},
|
||||||
xml = El},
|
xml = El},
|
||||||
private_storage_schema(),
|
private_storage_schema(),
|
||||||
[{'2i', [{<<"us">>, {LUser, LServer}}]}])
|
[{'2i', [{<<"us">>, {LUser, LServer}}]}])
|
||||||
end, Data),
|
end, ok, Data).
|
||||||
{atomic, ok}.
|
|
||||||
|
|
||||||
get_data(LUser, LServer, XMLNS) ->
|
get_data(LUser, LServer, XMLNS) ->
|
||||||
case ejabberd_riak:get(private_storage, private_storage_schema(),
|
case ejabberd_riak:get(private_storage, private_storage_schema(),
|
||||||
{LUser, LServer, XMLNS}) of
|
{LUser, LServer, XMLNS}) of
|
||||||
{ok, #private_storage{xml = El}} ->
|
{ok, #private_storage{xml = El}} ->
|
||||||
{ok, El};
|
{ok, El};
|
||||||
_ ->
|
{error, notfound} ->
|
||||||
error
|
error;
|
||||||
|
Err ->
|
||||||
|
Err
|
||||||
end.
|
end.
|
||||||
|
|
||||||
get_all_data(LUser, LServer) ->
|
get_all_data(LUser, LServer) ->
|
||||||
case ejabberd_riak:get_by_index(
|
case ejabberd_riak:get_by_index(
|
||||||
private_storage, private_storage_schema(),
|
private_storage, private_storage_schema(),
|
||||||
<<"us">>, {LUser, LServer}) of
|
<<"us">>, {LUser, LServer}) of
|
||||||
|
{ok, []} ->
|
||||||
|
error;
|
||||||
{ok, Res} ->
|
{ok, Res} ->
|
||||||
[El || #private_storage{xml = El} <- Res];
|
{ok, [El || #private_storage{xml = El} <- Res]};
|
||||||
_ ->
|
Err ->
|
||||||
[]
|
Err
|
||||||
end.
|
end.
|
||||||
|
|
||||||
remove_user(LUser, LServer) ->
|
del_data(LUser, LServer) ->
|
||||||
{atomic, ejabberd_riak:delete_by_index(private_storage,
|
ejabberd_riak:delete_by_index(private_storage,
|
||||||
<<"us">>, {LUser, LServer})}.
|
<<"us">>, {LUser, LServer}).
|
||||||
|
|
||||||
import(LServer, <<"private_storage">>,
|
import(LServer, <<"private_storage">>,
|
||||||
[LUser, XMLNS, XML, _TimeStamp]) ->
|
[LUser, XMLNS, XML, _TimeStamp]) ->
|
||||||
|
|
|
@ -27,11 +27,12 @@
|
||||||
-behaviour(mod_private).
|
-behaviour(mod_private).
|
||||||
|
|
||||||
%% API
|
%% API
|
||||||
-export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
|
-export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
|
||||||
import/3, export/1]).
|
import/3, export/1]).
|
||||||
|
|
||||||
-include("xmpp.hrl").
|
-include("xmpp.hrl").
|
||||||
-include("mod_private.hrl").
|
-include("mod_private.hrl").
|
||||||
|
-include("logger.hrl").
|
||||||
|
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% API
|
%%% API
|
||||||
|
@ -48,39 +49,46 @@ set_data(LUser, LServer, Data) ->
|
||||||
LServer, LUser, XMLNS, SData)
|
LServer, LUser, XMLNS, SData)
|
||||||
end, Data)
|
end, Data)
|
||||||
end,
|
end,
|
||||||
ejabberd_sql:sql_transaction(LServer, F).
|
case ejabberd_sql:sql_transaction(LServer, F) of
|
||||||
|
{atomic, ok} ->
|
||||||
|
ok;
|
||||||
|
_ ->
|
||||||
|
{error, db_failure}
|
||||||
|
end.
|
||||||
|
|
||||||
get_data(LUser, LServer, XMLNS) ->
|
get_data(LUser, LServer, XMLNS) ->
|
||||||
case catch sql_queries:get_private_data(LServer, LUser, XMLNS) of
|
case sql_queries:get_private_data(LServer, LUser, XMLNS) of
|
||||||
{selected, [{SData}]} ->
|
{selected, [{SData}]} ->
|
||||||
case fxml_stream:parse_element(SData) of
|
parse_element(LUser, LServer, SData);
|
||||||
Data when is_record(Data, xmlel) ->
|
{selected, []} ->
|
||||||
{ok, Data};
|
error;
|
||||||
_ ->
|
|
||||||
error
|
|
||||||
end;
|
|
||||||
_ ->
|
_ ->
|
||||||
error
|
{error, db_failure}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
get_all_data(LUser, LServer) ->
|
get_all_data(LUser, LServer) ->
|
||||||
case catch sql_queries:get_private_data(LServer, LUser) of
|
case catch sql_queries:get_private_data(LServer, LUser) of
|
||||||
|
{selected, []} ->
|
||||||
|
error;
|
||||||
{selected, Res} ->
|
{selected, Res} ->
|
||||||
lists:flatmap(
|
{ok, lists:flatmap(
|
||||||
fun({_, SData}) ->
|
fun({_, SData}) ->
|
||||||
case fxml_stream:parse_element(SData) of
|
case parse_element(LUser, LServer, SData) of
|
||||||
#xmlel{} = El ->
|
{ok, El} -> [El];
|
||||||
[El];
|
error -> []
|
||||||
_ ->
|
end
|
||||||
[]
|
end, Res)};
|
||||||
end
|
|
||||||
end, Res);
|
|
||||||
_ ->
|
_ ->
|
||||||
[]
|
{error, db_failure}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
remove_user(LUser, LServer) ->
|
del_data(LUser, LServer) ->
|
||||||
sql_queries:del_user_private_storage(LServer, LUser).
|
case sql_queries:del_user_private_storage(LServer, LUser) of
|
||||||
|
{updated, _} ->
|
||||||
|
ok;
|
||||||
|
_ ->
|
||||||
|
{error, db_failure}
|
||||||
|
end.
|
||||||
|
|
||||||
export(_Server) ->
|
export(_Server) ->
|
||||||
[{private_storage,
|
[{private_storage,
|
||||||
|
@ -99,3 +107,13 @@ import(_, _, _) ->
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% Internal functions
|
%%% Internal functions
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
|
parse_element(LUser, LServer, XML) ->
|
||||||
|
case fxml_stream:parse_element(XML) of
|
||||||
|
El when is_record(El, xmlel) ->
|
||||||
|
{ok, El};
|
||||||
|
_ ->
|
||||||
|
?ERROR_MSG("malformed XML element in SQL table "
|
||||||
|
"'private_storage' for user ~s@~s: ~s",
|
||||||
|
[LUser, LServer, XML]),
|
||||||
|
error
|
||||||
|
end.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user