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

Fix mam delete_old_messages_batch for sql backend 

Too much copy/paste from spool equivalent...
This commit is contained in:
Paweł Chmielowski 2022-06-17 10:22:57 +02:00
parent 382c3836af
commit a2efde185a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod_mam.erl
View File

@ -581,8 +581,8 @@ delete_old_messages_batch(Server, Type, Days, BatchSize, Rate) when Type == <<"c
case ejabberd_batch:register_task({mam, LServer}, 0, Rate, {LServer, TypeA, TimeStamp, BatchSize, none}, case ejabberd_batch:register_task({mam, LServer}, 0, Rate, {LServer, TypeA, TimeStamp, BatchSize, none},
fun({L, T, St, B, IS} = S) -> fun({L, T, St, B, IS} = S) ->
case {erlang:function_exported(Mod, remove_old_messages_batch, 4), case {erlang:function_exported(Mod, delete_old_messages_batch, 4),
erlang:function_exported(Mod, remove_old_messages_batch, 5)} of erlang:function_exported(Mod, delete_old_messages_batch, 5)} of
{true, _} -> {true, _} ->
case Mod:delete_old_messages_batch(L, St, T, B) of case Mod:delete_old_messages_batch(L, St, T, B) of
{ok, Count} -> {ok, Count} ->
@ -591,7 +591,7 @@ delete_old_messages_batch(Server, Type, Days, BatchSize, Rate) when Type == <<"c
E E
end; end;
{_, true} -> {_, true} ->
case Mod:remove_old_messages_batch(L, St, T, B, IS) of case Mod:delete_old_messages_batch(L, St, T, B, IS) of
{ok, IS2, Count} -> {ok, IS2, Count} ->
{ok, {L, St, T, B, IS2}, Count}; {ok, {L, St, T, B, IS2}, Count};
{error, _} = E -> {error, _} = E ->

4
src/mod_mam_mnesia.erl
View File

@ -29,7 +29,7 @@
%% API %% API
-export([init/2, remove_user/2, remove_room/3, delete_old_messages/3, -export([init/2, remove_user/2, remove_room/3, delete_old_messages/3,
extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, remove_from_archive/3, extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, remove_from_archive/3,
is_empty_for_user/2, is_empty_for_room/3, remove_old_messages_batch/5]). is_empty_for_user/2, is_empty_for_room/3, delete_old_messages_batch/5]).
-include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/ms_transform.hrl").
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
@ -155,7 +155,7 @@ delete_batch(LastUS, LServer, TS, Type, Num) ->
_ -> delete_batch(mnesia:next(archive_msg, LastUS), LServer, TS, Type, Left) _ -> delete_batch(mnesia:next(archive_msg, LastUS), LServer, TS, Type, Left)
end. end.
remove_old_messages_batch(LServer, TimeStamp, Type, Batch, LastUS) -> delete_old_messages_batch(LServer, TimeStamp, Type, Batch, LastUS) ->
R = mnesia:transaction( R = mnesia:transaction(
fun() -> fun() ->
{Num, NextUS} = delete_batch(LastUS, LServer, TimeStamp, Type, Batch), {Num, NextUS} = delete_batch(LastUS, LServer, TimeStamp, Type, Batch),