Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-12 21:52:07 +02:00
Code Releases Activity

Don't force rsm when max_items is not defined (#2189)

Browse Source
This commit is contained in:
Christophe Romain 2017-12-28 11:48:54 +01:00
parent 8918227fc3
commit 08e54dd621
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/node_flat.erl
View File

@ -734,14 +734,7 @@ del_state(#pubsub_state{stateid = {Key, Nidx}, items = Items}) ->
get_items(Nidx, _From, undefined) -> get_items(Nidx, _From, undefined) ->
RItems = lists:keysort(#pubsub_item.creation, RItems = lists:keysort(#pubsub_item.creation,
mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx)), mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx)),
Count = length(RItems), {result, {RItems, undefined}};
if Count =< ?MAXITEMS ->
{result, {RItems, undefined}};
true ->
ItemsPage = lists:sublist(RItems, ?MAXITEMS),
Rsm = rsm_page(Count, 0, 0, ItemsPage),
{result, {ItemsPage, Rsm}}
end;
get_items(Nidx, _From, #rsm_set{max = Max, index = IncIndex, get_items(Nidx, _From, #rsm_set{max = Max, index = IncIndex,
'after' = After, before = Before}) -> 'after' = After, before = Before}) ->

9
src/node_flat_sql.erl
View File

@ -655,14 +655,7 @@ get_items(Nidx, _From, undefined) ->
" from pubsub_item where nodeid='", SNidx/binary, "'", " from pubsub_item where nodeid='", SNidx/binary, "'",
" order by creation asc">>]) of " order by creation asc">>]) of
{selected, _, AllItems} -> {selected, _, AllItems} ->
Count = length(AllItems), {result, {[raw_to_item(Nidx, RItem) || RItem <- AllItems], undefined}};
if Count =< ?MAXITEMS ->
{result, {[raw_to_item(Nidx, RItem) || RItem <- AllItems], undefined}};
true ->
RItems = lists:sublist(AllItems, ?MAXITEMS),
Rsm = rsm_page(Count, 0, 0, RItems),
{result, {[raw_to_item(Nidx, RItem) || RItem <- RItems], Rsm}}
end;
_ -> _ ->
{result, {[], undefined}} {result, {[], undefined}}
end; end;