src/mod_pubsub/node_flat_sdb.erl src/mod_pubsub/node_hometree_sdb.erl src/mod_pubsub/node_pep_sdb.erl src/mod_pubsub/nodetree_tree_s3.erl @@ -2813,7 +2813,7 @@ subscription_to_string(_) -> "none". %% Node = pubsubNode() %% NodeStr = string() %% @doc Convert a node type from pubsubNode to string. -node_to_string(Node) -> binary_to_list(Node). +node_to_string(Node) -> binary_to_list(Node). string_to_node(SNode) -> list_to_binary(SNode). %% @spec (Host) -> jid() src/mod_pubsub/mod_pubsub.erl @@ -43,7 +43,7 @@ -include("pubsub.hrl"). -include("jlib.hrl"). --include("ejabberd.hrl"). + -behaviour(gen_pubsub_node). %% API definition @@ -79,8 +79,6 @@ node_to_path/1, path_to_node/1 ]). --define(DOMAIN, "pubsub"). --define(PREFIX, "item:"). %% ================ %% API definition @@ -95,26 +93,19 @@ %% This function is mainly used to trigger the setup task necessary for the %% plugin. It can be used for example by the developer to create the specific %% module database schema if it does not exists yet. -init(Host, ServerHost, Opts) -> +init(_Host, _ServerHost, _Opts) -> pubsub_subscription:init(), - erlsdb:start(), - Bucket = gen_mod:get_opt(s3_tree_bucket, Opts, ServerHost), - s3:start(), - {ok, Buckets} = s3:list_buckets(), - case lists:member(Bucket, Buckets) of - false -> - s3:create_bucket(Bucket), - ?INFO_MSG("S3 bucket ~s created", [Bucket]); - true -> ok - end, - ets:insert(gen_mod:get_module_proc(Host, config), {s3_bucket, Bucket}), - ets:insert(gen_mod:get_module_proc(ServerHost, config), {s3_bucket, Bucket}), - {ok, Domains, _Token} = erlsdb:list_domains(), - case lists:member(?DOMAIN, Domains) of - false -> - erlsdb:create_domain(?DOMAIN), - ?INFO_MSG("SimpleDB domain ~s created", [?DOMAIN]); - true -> ok + mnesia:create_table(pubsub_state, + [{disc_copies, [node()]}, + {attributes, record_info(fields, pubsub_state)}]), + mnesia:create_table(pubsub_item, + [{disc_only_copies, [node()]}, + {attributes, record_info(fields, pubsub_item)}]), + ItemsFields = record_info(fields, pubsub_item), + case mnesia:table_info(pubsub_item, attributes) of + ItemsFields -> ok; + _ -> + mnesia:transform_table(pubsub_item, ignore, ItemsFields) end, ok. @@ -231,7 +222,6 @@ create_node_permission(Host, ServerHost, Node, _ParentNode, Owner, Access) -> %% @doc create_node(NodeId, Owner) -> OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), - ?DEBUG("create node : ~p",[#pubsub_state{stateid = {OwnerKey, NodeId}, affiliation = owner}]), set_state(#pubsub_state{stateid = {OwnerKey, NodeId}, affiliation = owner}), {result, {default, broadcast}}. @@ -632,23 +622,18 @@ purge_node(NodeId, Owner) -> get_entity_affiliations(Host, Owner) -> SubKey = jlib:jid_tolower(Owner), GenKey = jlib:jid_remove_resource(SubKey), - SGenKey = jlib:jid_to_string(GenKey), - SHost = host_to_string(Host), - ?DEBUG("select * from pubsub where host='"++SHost ++"' and jid='" ++ SGenKey ++ "'", []), - {ok, Items}=erlsdb:s_all("select * from pubsub where host='"++SHost ++"' and jid='" ++ SGenKey ++ "%'"), - NodeTree = case ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of - [{nodetree, NT}] -> NT; + States = mnesia:match_object(#pubsub_state{stateid = {GenKey, '_'}, _ = '_'}), + NodeTree = case catch ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of + [{nodetree, N}] -> N; _ -> nodetree_tree end, - Affs = lists:foldl(fun(S,Acc)-> - #pubsub_state{stateid = {_, {_, N}}, affiliation = A} = sdb_to_record(S), - #pubsub_node{nodeid = {H, _}} = Node = NodeTree:get_node(Host, N), %%ECE Can't do any better. Need to change mod_pubsub otherwise. - case H of - Host -> [{Node, A}|Acc]; - _ -> Acc - end - end, [], Items), - {result, Affs}. + Reply = lists:foldl(fun(#pubsub_state{stateid = {_, N}, affiliation = A}, Acc) -> + case NodeTree:get_node(N) of + #pubsub_node{nodeid = {Host, _}} = Node -> [{Node, A}|Acc]; + _ -> Acc + end + end, [], States), + {result, Reply}. get_node_affiliations(NodeId) -> {result, States} = get_states(NodeId), @@ -685,16 +670,21 @@ set_affiliation(NodeId, Owner, Affiliation) -> %% that will be added to the affiliation stored in the main %% <tt>pubsub_state</tt> table. get_entity_subscriptions(Host, Owner) -> - SubKey = jlib:jid_tolower(Owner), - GenKey = jlib:jid_to_string(jlib:jid_remove_resource(SubKey)), - SHost = host_to_string(Host), - {ok, States}=erlsdb:s_all("select * from pubsub where host='"++ SHost ++"' and jid like '"++ GenKey ++"%'"), - NodeTree = case ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of - [{nodetree, NT}] -> NT; + {U, D, _} = SubKey = jlib:jid_tolower(Owner), + GenKey = jlib:jid_remove_resource(SubKey), + States = case SubKey of + GenKey -> mnesia:match_object( + #pubsub_state{stateid = {{U, D, '_'}, '_'}, _ = '_'}); + _ -> mnesia:match_object( + #pubsub_state{stateid = {GenKey, '_'}, _ = '_'}) + ++ mnesia:match_object( + #pubsub_state{stateid = {SubKey, '_'}, _ = '_'}) + end, + NodeTree = case catch ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of + [{nodetree, N}] -> N; _ -> nodetree_tree end, - Reply = lists:foldl(fun(Record, Acc) -> - #pubsub_state{stateid = {J, N}, subscriptions = Ss} = sdb_to_record(Record), + Reply = lists:foldl(fun(#pubsub_state{stateid = {J, N}, subscriptions = Ss}, Acc) -> case NodeTree:get_node(N) of #pubsub_node{nodeid = {Host, _}} = Node -> lists:foldl(fun({Sub, SubId}, Acc2) -> @@ -736,7 +726,10 @@ set_subscriptions(NodeId, Owner, Subscription, SubId) -> SubState = get_state(NodeId, SubKey), case {SubId, SubState#pubsub_state.subscriptions} of {_, []} -> - {error, ?ERR_ITEM_NOT_FOUND}; + case Subscription of + none -> {error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "not-subscribed")}; + _ -> new_subscription(NodeId, Owner, Subscription, SubState) + end; {"", [{_, SID}]} -> case Subscription of none -> unsub_with_subid(NodeId, SID, SubState); @@ -761,6 +754,12 @@ replace_subscription(_, [], Acc) -> replace_subscription({Sub, SubId}, [{_, SubID} | T], Acc) -> replace_subscription({Sub, SubId}, T, [{Sub, SubID} | Acc]). +new_subscription(NodeId, Owner, Subscription, SubState) -> + SubId = pubsub_subscription:add_subscription(Owner, NodeId, []), + Subscriptions = SubState#pubsub_state.subscriptions, + set_state(SubState#pubsub_state{subscriptions = [{Subscription, SubId} | Subscriptions]}), + {Subscription, SubId}. + unsub_with_subid(NodeId, SubId, SubState) -> pubsub_subscription:delete_subscription(SubState#pubsub_state.stateid, NodeId, SubId), @@ -785,7 +784,7 @@ get_pending_nodes(Host, Owner) -> affiliation = owner, _ = '_'}), NodeIDs = [ID || #pubsub_state{stateid = {_, ID}} <- States], - NodeTree = case ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of + NodeTree = case catch ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of [{nodetree, N}] -> N; _ -> nodetree_tree end, @@ -820,28 +819,6 @@ get_nodes_helper(NodeTree, false end. -sdb_to_record({_Key, Attrs})-> - str(Attrs, #pubsub_state{stateid={nil, {nil, nil}}}); -sdb_to_record(Item)-> - str(Item, #pubsub_state{stateid={nil, {nil,nil}}}). - -str([],#pubsub_state{}=State) -> - State; -str([{"host", V}|Rest], #pubsub_state{stateid={Jid, {_, Node}}}=N)-> - Host = string_to_host(V), - str(Rest, N#pubsub_state{stateid={Jid, {Host, Node}}}); -str([{"node", V}|Rest], #pubsub_state{stateid={Jid, {Host, _}}}=N)-> - Node = mod_pubsub:string_to_node(V), - str(Rest, N#pubsub_state{stateid={Jid, {Host, Node}}}); -str([{"jid", V}|Rest], #pubsub_state{stateid={_, {Host, Node}}}=N)-> - Jid = jlib:jid_tolower(jlib:string_to_jid(V)), - str(Rest, N#pubsub_state{stateid={Jid, {Host, Node}}}); -str([{"affiliation", V}|Rest], N)-> - str(Rest, N#pubsub_state{affiliation=l2a(V)}); -str([{"subscription", V}|Rest], N)-> - str(Rest, N#pubsub_state{subscriptions=[l2a(V)|N#pubsub_state.subscriptions]}); -str([{_, _ }|Rest], S)->str(Rest, S). - %% @spec (NodeId) -> [States] | [] %% NodeId = mod_pubsub:pubsubNodeId() %% @doc Returns the list of stored states for a given node. @@ -867,39 +844,18 @@ get_states(NodeId) -> %% JID = mod_pubsub:jid() %% State = mod_pubsub:pubsubItems() %% @doc Returns a state (one state list), given its reference. -get_state({Host, Node}, JID) -> - {_SJID, _SHost, _SNode, Key} = make_key({JID, {Host, Node}}), - {ok, Attrs} = erlsdb:get_attributes(?DOMAIN, Key), - S = sdb_to_record(Attrs), - State = S#pubsub_state{stateid = {JID, {Host, Node}}}, - %?DEBUG("state fetched from SDB for JID : ~s / Host: ~s / Node : ~s :~n~p", [SJID, SHost, SNode, State]), - State. - -make_key({JID, {Host, Node}})-> - SNode = mod_pubsub:node_to_string(Node), - SHost = host_to_string(Host), - SJID = jlib:jid_to_string(JID), - {SJID, SHost, SNode, SHost ++ ":" ++ SNode ++ ":" ++ SJID}. - +get_state(NodeId, JID) -> + StateId = {JID, NodeId}, + case catch mnesia:read({pubsub_state, StateId}) of + [State] when is_record(State, pubsub_state) -> State; + _ -> #pubsub_state{stateid=StateId} + end. %% @spec (State) -> ok | {error, Reason::stanzaError()} %% State = mod_pubsub:pubsubStates() %% @doc Write a state into database. -set_state(#pubsub_state{stateid = StateId, - affiliation = Aff, - subscriptions = Subs})-> - {SJID, SHost, SNode, Key} = make_key(StateId), - SdbSubs = lists:map(fun(S)-> - {"subscription", a2l(S)} - end, Subs), - - erlsdb:replace_attributes(?DOMAIN, Key, [{"host", SHost}, - {"node", SNode}, - {"jid", SJID}, - {"affiliation", a2l(Aff)} - | SdbSubs ]), - - ok; +set_state(State) when is_record(State, pubsub_state) -> + mnesia:write(State); set_state(_) -> {error, ?ERR_INTERNAL_SERVER_ERROR}. @@ -908,9 +864,7 @@ set_state(_) -> %% JID = mod_pubsub:jid() %% @doc Delete a state from database. del_state(NodeId, JID) -> - {_SJID, _SHost, _SNode, Key} = make_key({JID, NodeId}), - erlsdb:delete_item(?DOMAIN,Key), - ok. + mnesia:delete({pubsub_state, {JID, NodeId}}). %% @spec (NodeId, From) -> [Items] | [] %% NodeId = mod_pubsub:pubsubNodeId() @@ -925,13 +879,9 @@ del_state(NodeId, JID) -> %% they can implement this function like this: %% ```get_items(NodeId, From) -> %% node_default:get_items(NodeId, From).''' -get_items({Host, Node}, _From) -> - Items = s3:get_objects(get_bucket(Host), [{prefix,build_key(Host, Node,"")}] ), - Items2 = lists:map(fun({_K, Conf, _H})-> - binary_to_term(list_to_binary(Conf)) - end, Items), - {result, lists:reverse(lists:keysort(#pubsub_item.modification, Items2))}. - +get_items(NodeId, _From) -> + Items = mnesia:match_object(#pubsub_item{itemid = {'_', NodeId}, _ = '_'}), + {result, lists:reverse(lists:keysort(#pubsub_item.modification, Items))}. get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) -> SubKey = jlib:jid_tolower(JID), GenKey = jlib:jid_remove_resource(SubKey), @@ -969,25 +919,17 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) - get_items(NodeId, JID) end. -build_key(Host, Node,ItemId)-> - SHost = host_to_string(Host), - SNode = mod_pubsub:node_to_string(Node), - ?PREFIX++":"++SHost++":"++SNode++":"++ItemId. -build_key(#pubsub_item{itemid={ItemId, {Host, Node}}})-> - build_key(Host, Node,ItemId). - - %% @spec (NodeId, ItemId) -> [Item] | [] %% NodeId = mod_pubsub:pubsubNodeId() %% ItemId = string() %% Item = mod_pubsub:pubsubItems() %% @doc Returns an item (one item list), given its reference. -get_item({Host, Node}, ItemId) -> - case s3:read_object(get_bucket(Host), build_key(Host, Node,ItemId)) of - {ok, {Conf, _H}}-> - {result, binary_to_term(list_to_binary(Conf))}; - _ -> - {error, ?ERR_ITEM_NOT_FOUND} +get_item(NodeId, ItemId) -> + case mnesia:read({pubsub_item, {ItemId, NodeId}}) of + [Item] when is_record(Item, pubsub_item) -> + {result, Item}; + _ -> + {error, ?ERR_ITEM_NOT_FOUND} end. get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) -> SubKey = jlib:jid_tolower(JID), @@ -1028,11 +970,8 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S %% @spec (Item) -> ok | {error, Reason::stanzaError()} %% Item = mod_pubsub:pubsubItems() %% @doc Write an item into database. -set_item(#pubsub_item{itemid={_,NodeId}}=Item) when is_record(Item, pubsub_item) -> - spawn(fun()-> - s3:write_object(get_bucket(NodeId), build_key(Item), term_to_binary(Item), "application/erlang") - end), - ok; +set_item(Item) when is_record(Item, pubsub_item) -> + mnesia:write(Item); set_item(_) -> {error, ?ERR_INTERNAL_SERVER_ERROR}. @@ -1040,11 +979,8 @@ set_item(_) -> %% NodeId = mod_pubsub:pubsubNodeId() %% ItemId = string() %% @doc Delete an item from database. -del_item({Host, Node}=NodeId, ItemId) -> - spawn(fun()-> - s3:delete_object(get_bucket(NodeId), build_key(Host, Node, ItemId)) - end), - ok. +del_item(NodeId, ItemId) -> + mnesia:delete({pubsub_item, {ItemId, NodeId}}). del_items(NodeId, ItemIds) -> lists:foreach(fun(ItemId) -> del_item(NodeId, ItemId) @@ -1075,44 +1011,6 @@ can_fetch_item(outcast, _) -> false; can_fetch_item(none, Subscriptions) -> is_subscribed(Subscriptions); can_fetch_item(_Affiliation, _Subscription) -> false. -%% @spec (NodeId) -> Node -%% @doc retreive pubsubNode() representation giving a NodeId -%get_nodename(NodeId) -> -% case mnesia:index_read(pubsub_node, NodeId, #pubsub_node.id) of -% [#pubsub_node{nodeid = {_, Node}}] -> Node; -% _ -> [] -% end. - -a2l([])->[]; -a2l(Atom) when is_atom(Atom)->atom_to_list(Atom). -l2a("member")->member; -l2a("owner")->owner; -l2a("publisher")->publisher; -l2a("outcast")->outcast; -l2a("subscribed")->subscribed; -l2a("none")->none. - -host_to_string({_, _, _}=Host)-> - jlib:jid_to_string(Host); -host_to_string(Host) when is_list(Host)-> Host. -string_to_host(Host) when is_list(Host)-> - case jlib:jid_tolower(jlib:string_to_jid(Host)) of - {[], PubSub, []} -> PubSub; - JID -> JID - end. - -get_bucket({_U, S, _R})-> - get_bucket(S); -get_bucket({{_U, S, _R}, _Node})-> - get_bucket(S); -get_bucket({Host, _Node})-> - get_bucket(Host); -get_bucket(Host) when is_list(Host)-> - [{s3_bucket, Bucket}] = ets:lookup(gen_mod:get_module_proc(Host, config), s3_bucket), - Bucket; -get_bucket(Host)-> - ?ERROR_MSG("Unsupported host format : ~p", [Host]). - is_subscribed(Subscriptions) -> lists:any(fun ({subscribed, _SubId}) -> true; (_) -> false src/mod_pubsub/node_hometree.erl @@ -195,36 +195,36 @@ get_affiliation(NodeId, Owner) -> set_affiliation(NodeId, Owner, Affiliation) -> node_hometree:set_affiliation(NodeId, Owner, Affiliation). -get_entity_subscriptions(Host, Owner) -> - node_default:get_entity_subscriptions(Host, Owner). - %{U, D, _} = SubKey = jlib:jid_tolower(Owner), - %GenKey = jlib:jid_remove_resource(SubKey), - %States = case SubKey of - %GenKey -> mnesia:match_object( - % #pubsub_state{stateid = {{U, D, '_'}, '_'}, _ = '_'}); - %_ -> mnesia:match_object( - % #pubsub_state{stateid = {GenKey, '_'}, _ = '_'}) - % ++ mnesia:match_object( - % #pubsub_state{stateid = {SubKey, '_'}, _ = '_'}) - %end, - %NodeTree = case ets:lookup(gen_mod:get_module_proc(D, config), nodetree) of - % [{nodetree, N}] -> N; - % _ -> nodetree_tree - %end, - %Reply = lists:foldl(fun(#pubsub_state{stateid = {J, N}, subscriptions = Ss}, Acc) -> - %case NodeTree:get_node(N) of - % #pubsub_node{nodeid = {{_, D, _}, _}} = Node -> - % lists:foldl(fun({subscribed, SubID}, Acc2) -> - % [{Node, subscribed, SubID, J} | Acc2]; - % ({pending, _SubID}, Acc2) -> - % [{Node, pending, J} | Acc2]; - % (S, Acc2) -> - % [{Node, S, J} | Acc2] - % end, Acc, Ss); - % _ -> Acc - %end - %end, [], States), - %{result, Reply}. + +get_entity_subscriptions(_Host, Owner) -> + {U, D, _} = SubKey = jlib:jid_tolower(Owner), + GenKey = jlib:jid_remove_resource(SubKey), + States = case SubKey of + GenKey -> mnesia:match_object( + #pubsub_state{stateid = {{U, D, '_'}, '_'}, _ = '_'}); + _ -> mnesia:match_object( + #pubsub_state{stateid = {GenKey, '_'}, _ = '_'}) + ++ mnesia:match_object( + #pubsub_state{stateid = {SubKey, '_'}, _ = '_'}) + end, + NodeTree = case catch ets:lookup(gen_mod:get_module_proc(D, config), nodetree) of + [{nodetree, N}] -> N; + _ -> nodetree_tree + end, + Reply = lists:foldl(fun(#pubsub_state{stateid = {J, N}, subscriptions = Ss}, Acc) -> + case NodeTree:get_node(N) of + #pubsub_node{nodeid = {{_, D, _}, _}} = Node -> + lists:foldl(fun({subscribed, SubID}, Acc2) -> + [{Node, subscribed, SubID, J} | Acc2]; + ({pending, _SubID}, Acc2) -> + [{Node, pending, J} | Acc2]; + (S, Acc2) -> + [{Node, S, J} | Acc2] + end, Acc, Ss); + _ -> Acc + end + end, [], States), + {result, Reply}. get_node_subscriptions(NodeId) -> %% note: get_node_subscriptions is used for broadcasting src/mod_pubsub/node_pep.erl @@ -40,7 +40,7 @@ -include("pubsub.hrl"). -include("jlib.hrl"). --include("ejabberd.hrl"). + -behaviour(gen_pubsub_nodetree). -export([init/3, @@ -57,11 +57,9 @@ get_subnodes/3, get_subnodes_tree/3, create_node/6, - delete_node/2, - make_key/1 + delete_node/2 ]). --define(PREFIX, "node:"). %% ================ %% API definition @@ -76,18 +74,18 @@ %% This function is mainly used to trigger the setup task necessary for the %% plugin. It can be used for example by the developer to create the specific %% module database schema if it does not exists yet. -init(Host, ServerHost, Opts) -> - Bucket = gen_mod:get_opt(s3_bucket, Opts, ServerHost), - s3:start(), - {ok, Buckets} = s3:list_buckets(), - case lists:member(Bucket, Buckets) of - false -> - s3:create_bucket(Bucket), - ?INFO_MSG("S3 bucket ~s created", [Bucket]); - true -> ok +init(_Host, _ServerHost, _Opts) -> + mnesia:create_table(pubsub_node, + [{disc_copies, [node()]}, + {attributes, record_info(fields, pubsub_node)}]), + mnesia:add_table_index(pubsub_node, id), + NodesFields = record_info(fields, pubsub_node), + case mnesia:table_info(pubsub_node, attributes) of + NodesFields -> ok; + _ -> + ok + %% mnesia:transform_table(pubsub_state, ignore, StatesFields) end, - ets:insert(gen_mod:get_module_proc(Host, config), {s3_bucket, Bucket}), - ets:insert(gen_mod:get_module_proc(ServerHost, config), {s3_bucket, Bucket}), ok. terminate(_Host, _ServerHost) -> ok. @@ -100,43 +98,11 @@ options() -> %% @spec (NodeRecord) -> ok | {error, Reason} %% Record = mod_pubsub:pubsub_node() -set_node(#pubsub_node{nodeid = NodeId}=N)-> - Key = make_key(NodeId), - s3:write_term(get_bucket(NodeId), Key, N), - ok; - +set_node(Record) when is_record(Record, pubsub_node) -> + mnesia:write(Record); set_node(_) -> {error, ?ERR_INTERNAL_SERVER_ERROR}. -make_key({{_U, _S, _R}=JID, []})-> - SHost = jlib:jid_to_string(JID), - ?PREFIX++SHost ++ ":"; -make_key({{_U, _S, _R}=JID, Node})-> - SNode = mod_pubsub:node_to_string(Node), - SHost = jlib:jid_to_string(JID), - ?PREFIX++SHost ++ ":" ++ SNode; -make_key({Host, []})-> - ?PREFIX++Host ++ ":"; -make_key({Host, Node})-> - SNode = mod_pubsub:node_to_string(Node), - ?PREFIX++Host ++ ":" ++ SNode. -parse_key(?PREFIX++Key) -> - [Host| R] = string:tokens(Key, ":"), - {Host, mod_pubsub:string_to_node(string:join(R, ":"))}. - - -get_bucket({_U, S, _R})-> - get_bucket(S); -get_bucket({{_U, S, _R}, _Node})-> - get_bucket(S); -get_bucket({Host, _Node})-> - get_bucket(Host); -get_bucket(Host) when is_list(Host)-> - [{s3_bucket, Bucket}] = ets:lookup(gen_mod:get_module_proc(Host, config), s3_bucket), - Bucket; -get_bucket(Host)-> - ?ERROR_MSG("Unsupported host format : ~p", [Host]). - get_node(Host, Node, _From) -> get_node(Host, Node). @@ -144,17 +110,17 @@ get_node(Host, Node, _From) -> %% Host = mod_pubsub:host() %% Node = mod_pubsub:pubsubNode() get_node(Host, Node) -> - Key = make_key({Host, Node}), - case s3:read_object(get_bucket(Host), Key) of - {ok, {Conf, _H}}-> - R = binary_to_term(list_to_binary(Conf)), - ?DEBUG("Got node : ~p", [R]), - R; - _ -> - {error, ?ERR_ITEM_NOT_FOUND} - end. -get_node({Host, Node}) -> - get_node(Host, Node). + case catch mnesia:read({pubsub_node, {Host, Node}}) of + [Record] when is_record(Record, pubsub_node) -> Record; + [] -> {error, ?ERR_ITEM_NOT_FOUND}; + Error -> Error + end. +get_node(NodeId) -> + case catch mnesia:index_read(pubsub_node, NodeId, #pubsub_node.id) of + [Record] when is_record(Record, pubsub_node) -> Record; + [] -> {error, ?ERR_ITEM_NOT_FOUND}; + Error -> Error + end. get_nodes(Host, _From) -> get_nodes(Host). @@ -162,9 +128,7 @@ get_nodes(Host, _From) -> %% @spec (Host) -> [pubsubNode()] | {error, Reason} %% Host = mod_pubsub:host() | mod_pubsub:jid() get_nodes(Host) -> - K=make_key({Host, []}), - Nodes = s3:get_objects(get_bucket(Host), [{prefix, K}]), - lists:map(fun({_K, Bin, _H})-> binary_to_term(list_to_binary(Bin)) end, Nodes). + mnesia:match_object(#pubsub_node{nodeid = {Host, '_'}, _ = '_'}). %% @spec (Host, Node, From) -> [{Depth, Record}] | {error, Reason} %% Host = mod_pubsub:host() | mod_pubsub:jid() @@ -195,70 +159,83 @@ get_parentnodes_tree(Host, Node, From) -> %% Node = mod_pubsub:pubsubNode() %% From = mod_pubsub:jid() get_subnodes(Host, Node, _From) -> - Key=make_key({Host, Node}), - K = case lists:reverse(Key) of - [$/|_R] -> Key; - _ -> Key ++ "/" - end, - Nodes = s3:get_objects(get_bucket(Host), [{prefix, K}, {delimiter, "/"}]), - lists:map(fun({_K, Bin, _H})-> binary_to_term(list_to_binary(Bin)) end, Nodes). + get_subnodes(Host, Node). +get_subnodes(Host, <<>>) -> + Q = qlc:q([N || #pubsub_node{nodeid = {NHost, _}, + parents = Parents} = N <- mnesia:table(pubsub_node), + Host == NHost, + Parents == []]), + qlc:e(Q); +get_subnodes(Host, Node) -> + Q = qlc:q([N || #pubsub_node{nodeid = {NHost, _}, + parents = Parents} = N <- mnesia:table(pubsub_node), + Host == NHost, + lists:member(Node, Parents)]), + qlc:e(Q). +get_subnodes_tree(Host, Node, _From) -> + get_subnodes_tree(Host, Node). %% @spec (Host, Index) -> [pubsubNodeIdx()] | {error, Reason} %% Host = mod_pubsub:host() %% Node = mod_pubsub:pubsubNode() -get_subnodes_tree(Host, Node,_From) -> - get_subnodes_tree(Host, Node). - -get_subnodes_tree(Host, Node)-> - Key=make_key({Host, Node}), - {ok, Items} = s3:list_objects(get_bucket(Host), [{prefix, Key}]), - lists:foldl(fun({object_info,{"Key", K }, _, _,_}, Acc)-> - case parse_key(K) of - {_H, Node}->Acc; - {_H, N}->[N|Acc] - end - end, [], Items). +%% From = mod_pubsub:jid() +get_subnodes_tree(Host, Node) -> + case get_node(Host, Node) of + {error, _} -> + []; + Rec -> + BasePlugin = list_to_atom("node_"++Rec#pubsub_node.type), + BasePath = BasePlugin:node_to_path(Node), + mnesia:foldl(fun(#pubsub_node{nodeid = {H, N}} = R, Acc) -> + Plugin = list_to_atom("node_"++R#pubsub_node.type), + Path = Plugin:node_to_path(N), + case lists:prefix(BasePath, Path) and (H == Host) of + true -> [R | Acc]; + false -> Acc + end + end, [], pubsub_node) + end. -%% @spec (Key, Node, Type, Owner, Options) -> ok | {error, Reason} -%% Key = mod_pubsub:host() | mod_pubsub:jid() +%% @spec (Host, Node, Type, Owner, Options) -> ok | {error, Reason} +%% Host = mod_pubsub:host() | mod_pubsub:jid() %% Node = mod_pubsub:pubsubNode() %% NodeType = mod_pubsub:nodeType() %% Owner = mod_pubsub:jid() %% Options = list() -create_node(Key, Node, Type, Owner, Options, Parents) -> +create_node(Host, Node, Type, Owner, Options, Parents) -> BJID = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), - case get_node(Key, Node) of - {error, ?ERR_ITEM_NOT_FOUND} -> - {ParentNode, ParentExists} = - case Key of + case catch mnesia:read({pubsub_node, {Host, Node}}) of + [] -> + ParentExists = + case Host of {_U, _S, _R} -> %% This is special case for PEP handling %% PEP does not uses hierarchy - {[], true}; + true; _ -> case Parents of [] -> true; [Parent|_] -> - case get_node(Key, Parent) of - {error, ?ERR_ITEM_NOT_FOUND} -> false; - #pubsub_node{owners = Owners} -> lists:member(BJID, Owners); - _ -> false - end + case catch mnesia:read({pubsub_node, {Host, Parent}}) of + [#pubsub_node{owners = [{[], Host, []}]}] -> true; + [#pubsub_node{owners = Owners}] -> lists:member(BJID, Owners); + _ -> false + end; + _ -> + false end end, case ParentExists of true -> - %% Service requires registration - %%{error, ?ERR_REGISTRATION_REQUIRED}; - %NodeId = pubsub_index:new(node), - set_node(#pubsub_node{nodeid = {Key, Node}, + NodeId = pubsub_index:new(node), + mnesia:write(#pubsub_node{nodeid = {Host, Node}, + id = NodeId, parents = Parents, - id = {Key, Node}, type = Type, owners = [BJID], options = Options}), - {ok, {Key, Node}}; + {ok, NodeId}; false -> %% Requesting entity is prohibited from creating nodes {error, ?ERR_FORBIDDEN} @@ -268,13 +245,13 @@ create_node(Key, Node, Type, Owner, Options, Parents) -> {error, ?ERR_CONFLICT} end. -%% @spec (Key, Node) -> [mod_pubsub:node()] -%% Key = mod_pubsub:host() | mod_pubsub:jid() +%% @spec (Host, Node) -> [mod_pubsub:node()] +%% Host = mod_pubsub:host() | mod_pubsub:jid() %% Node = mod_pubsub:pubsubNode() -delete_node(Key, Node) -> - Removed = get_subnodes_tree(Key, Node), - lists:foreach(fun(N) -> - K = make_key({Key, N}), - s3:delete_object(get_bucket(Key), K) - end, Removed), +delete_node(Host, Node) -> + Removed = get_subnodes_tree(Host, Node), + lists:foreach(fun(#pubsub_node{nodeid = {_, N}, id = I}) -> + pubsub_index:free(node, I), + mnesia:delete({pubsub_node, {Host, N}}) + end, Removed), Removed. src/mod_pubsub/nodetree_tree.erl c84889ccd2c33f58265892eb8a4ec69f6206e6fc Eric Cestari ecestari@mac.com http://github.com/cstar/ejabberd/commit/201526edac8c9040b750621c852602767de8f906 201526edac8c9040b750621c852602767de8f906

2009-10-29T07:19:17-07:00

Moving my AWS code out of the way in mod_pubsub. Don't have time to maintain it currently. There are many good optimizations and features in mod_pubsub I'll need to port. aa892d8336496b857942934d93a934602ae5d04c Eric Cestari ecestari@mac.com