greg/bdberl
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

txn_abort() used to return ok even if no txn. The error code changes

Browse source 
broke that behavior.  Changed it to return ok if there was no txn.
This commit is contained in:
Jon Meredith 2009-05-29 13:45:58 -06:00
parent 1409096860
commit a3462d0fa7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/bdberl.erl
View file

@ -463,6 +463,7 @@ txn_abort() ->
ok ->
receive
ok -> ok;
{error, no_txn} -> ok;
{error, Reason} -> {error, decode_rc(Reason)}
end;
@ -540,13 +541,14 @@ transaction(Fun, Retries) ->
{ok, db_value()} | db_txn_error().
transaction(_Fun, 0, _Opts) ->
ok = txn_abort(),
{error, {transaction_failed, retry_limit_reached}};
transaction(Fun, Retries, Opts) ->
case txn_begin(Opts) of
ok ->
try Fun() of
abort ->
error_logger:info_msg("function requested abort"),
ok = txn_abort(),
{error, transaction_aborted};
@ -566,6 +568,7 @@ transaction(Fun, Retries, Opts) ->
transaction(Fun, R);
_ : Reason ->
error_logger:info_msg("function threw non-lock error - ~p", [Reason]),
ok = txn_abort(),
{error, {transaction_failed, Reason}}
end;