Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Optimize sql queries in pubsub select_affiliation_subscriptions

This commit is contained in:
Paweł Chmielowski 2020-01-31 11:43:29 +01:00
parent 2d32c66fd7
commit fdb7e3e3fa
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node_flat_sql.erl
View File

@ -894,10 +894,23 @@ select_affiliation_subscriptions(Nidx, JID) ->
select_affiliation_subscriptions(Nidx, JID, JID) ->
select_affiliation_subscriptions(Nidx, JID);
select_affiliation_subscriptions(Nidx, GenKey, SubKey) ->
{result, Affiliation} = get_affiliation(Nidx, GenKey),
{result, BareJidSubs} = get_subscriptions(Nidx, GenKey),
{result, FullJidSubs} = get_subscriptions(Nidx, SubKey),
{Affiliation, BareJidSubs++FullJidSubs}.
GJ = encode_jid(GenKey),
SJ = encode_jid(SubKey),
case catch
ejabberd_sql:sql_query_t(
?SQL("select jid = %(GJ)s as @(G)d, @(affiliation)s, @(subscriptions)s from "
" pubsub_state where nodeid=%(Nidx)d and jid in (%(GJ)s, %(SJ)s)"))
of
{selected, Res} ->
lists:foldr(
fun({1, A, S}, {_, Subs}) ->
{decode_affiliation(A), Subs ++ decode_subscriptions(S)};
({_, _, S}, {Aff, Subs}) ->
{Aff, Subs ++ decode_subscriptions(S)}
end, {none, []}, Res);
_ ->
{none, []}
end.
update_affiliation(Nidx, JID, Affiliation) ->
J = encode_jid(JID),