Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Allow to configure number of restart in sql_transaction()

Browse Source
This commit is contained in:
Paweł Chmielowski 2024-07-16 15:25:55 +02:00
parent 4cc95dda42
commit c5f2b389c3
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ejabberd_sql.erl
View File

@ -35,7 +35,7 @@
sql_query/3, sql_query/3,
sql_query_t/1, sql_query_t/1,
sql_transaction/2, sql_transaction/2,
sql_transaction/3, sql_transaction/4,
sql_bloc/2, sql_bloc/2,
sql_bloc/3, sql_bloc/3,
abort/1, abort/1,
@ -134,19 +134,19 @@ sql_query(Host, Query) ->
%% SQL transaction based on a list of queries %% SQL transaction based on a list of queries
%% This function automatically %% This function automatically
-spec sql_transaction(binary(), [sql_query(T)] | fun(() -> T), pos_integer()) -> -spec sql_transaction(binary(), [sql_query(T)] | fun(() -> T), pos_integer(), pos_integer()) ->
{atomic, T} | {atomic, T} |
{aborted, any()}. {aborted, any()}.
sql_transaction(Host, Queries, Timeout) sql_transaction(Host, Queries, Timeout, Restarts)
when is_list(Queries) -> when is_list(Queries) ->
F = fun () -> F = fun () ->
lists:foreach(fun (Query) -> sql_query_t(Query) end, lists:foreach(fun (Query) -> sql_query_t(Query) end,
Queries) Queries)
end, end,
sql_transaction(Host, F, Timeout); sql_transaction(Host, F, Timeout, Restarts);
%% SQL transaction, based on a erlang anonymous function (F = fun) %% SQL transaction, based on a erlang anonymous function (F = fun)
sql_transaction(Host, F, Timeout) when is_function(F) -> sql_transaction(Host, F, Timeout, Restarts) when is_function(F) ->
case sql_call(Host, {sql_transaction, F}, Timeout) of case sql_call(Host, {sql_transaction, F, Restarts}, Timeout) of
{atomic, _} = Ret -> Ret; {atomic, _} = Ret -> Ret;
{aborted, _} = Ret -> Ret; {aborted, _} = Ret -> Ret;
Err -> {aborted, Err} Err -> {aborted, Err}
@ -156,7 +156,7 @@ sql_transaction(Host, F, Timeout) when is_function(F) ->
{atomic, T} | {atomic, T} |
{aborted, any()}. {aborted, any()}.
sql_transaction(Host, Queries) -> sql_transaction(Host, Queries) ->
sql_transaction(Host, Queries, query_timeout(Host)). sql_transaction(Host, Queries, query_timeout(Host), ?MAX_TRANSACTION_RESTARTS).
%% SQL bloc, based on a erlang anonymous function (F = fun) %% SQL bloc, based on a erlang anonymous function (F = fun)
sql_bloc(Host, F, Timeout) -> sql_bloc(Host, F, Timeout) ->
@ -538,12 +538,14 @@ run_sql_cmd(Command, From, State, Timestamp) ->
end. end.
%% @doc Only called by handle_call, only handles top level operations. %% @doc Only called by handle_call, only handles top level operations.
-spec outer_op(Op::{atom(), binary()}) -> -spec outer_op(Op::{atom(), binary()} | {sql_transaction, binary(), pos_integer()}) ->
{error, Reason::binary()} | {aborted, Reason::binary()} | {atomic, Result::any()}. {error, Reason::binary()} | {aborted, Reason::binary()} | {atomic, Result::any()}.
outer_op({sql_query, Query}) -> outer_op({sql_query, Query}) ->
sql_query_internal(Query); sql_query_internal(Query);
outer_op({sql_transaction, F}) -> outer_op({sql_transaction, F}) ->
outer_transaction(F, ?MAX_TRANSACTION_RESTARTS, <<"">>); outer_op({sql_transaction, F, ?MAX_TRANSACTION_RESTARTS});
outer_op({sql_transaction, F, Restarts}) ->
outer_transaction(F, Restarts, <<"">>);
outer_op({sql_bloc, F}) -> execute_bloc(F). outer_op({sql_bloc, F}) -> execute_bloc(F).
%% Called via sql_query/transaction/bloc from client code when inside a %% Called via sql_query/transaction/bloc from client code when inside a
@ -551,10 +553,12 @@ outer_op({sql_bloc, F}) -> execute_bloc(F).
nested_op({sql_query, Query}) -> nested_op({sql_query, Query}) ->
sql_query_internal(Query); sql_query_internal(Query);
nested_op({sql_transaction, F}) -> nested_op({sql_transaction, F}) ->
nested_op({sql_transaction, F, ?MAX_TRANSACTION_RESTARTS});
nested_op({sql_transaction, F, Restarts}) ->
NestingLevel = get(?NESTING_KEY), NestingLevel = get(?NESTING_KEY),
if NestingLevel =:= (?TOP_LEVEL_TXN) -> if NestingLevel =:= (?TOP_LEVEL_TXN) ->
outer_transaction(F, ?MAX_TRANSACTION_RESTARTS, <<"">>); outer_transaction(F, Restarts, <<"">>);
true -> inner_transaction(F) true -> inner_transaction(F)
end; end;
nested_op({sql_bloc, F}) -> execute_bloc(F). nested_op({sql_bloc, F}) -> execute_bloc(F).