commit 523a73875825a80f49aec04e69ad0f0f6a3fad41
author Nick Vatamaniuc <nickva@users.noreply.github.com> Sat Apr 18 16:49:13 2020 -0400
committer GitHub <noreply@github.com> Sat Apr 18 16:49:13 2020 -0400
tree b6be5f60c79d65fc1ea3b93c7623e70a241398ff
parent 5396535067c99b45b22cf915d3b67961c2a68aad
parent 15b597460d922a0e9df463bd3f2990cf6abdacb0

Merge pull request #1 from apache/dont-create-new-tx-object-on-retries

Do not create a new transaction object during retries

src/erlfdb.erl

diff --git a/src/erlfdb.erl b/src/erlfdb.erl
index d4e7d8a..2f6460e 100644
--- a/src/erlfdb.erl
+++ b/src/erlfdb.erl
@@ -156,7 +156,8 @@
 
 transactional(?IS_DB = Db, UserFun) when is_function(UserFun, 1) ->
     clear_erlfdb_error(),
-    do_transaction(Db, UserFun);
+    Tx = create_transaction(Db),
+    do_transaction(Tx, UserFun);
 
 transactional(?IS_TX = Tx, UserFun) when is_function(UserFun, 1) ->
     UserFun(Tx);
@@ -641,8 +642,7 @@
     put(?ERLFDB_ERROR, undefined).
 
 
-do_transaction(Db, UserFun) ->
-    Tx = create_transaction(Db),
+do_transaction(?IS_TX = Tx, UserFun) ->
     try
         Ret = UserFun(Tx),
         wait(commit(Tx)),
@@ -650,7 +650,7 @@
     catch error:{erlfdb_error, Code} ->
         put(?ERLFDB_ERROR, Code),
         wait(on_error(Tx, Code)),
-        do_transaction(Db, UserFun)
+        do_transaction(Tx, UserFun)
     end.