From e26ec24c2a1d8f1d9cc87376b4dcb122f765064c Mon Sep 17 00:00:00 2001 From: reugn Date: Tue, 17 Dec 2024 09:51:42 +0200 Subject: [PATCH] resolve merge conflicts --- pulsar/transaction_impl.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar/transaction_impl.go b/pulsar/transaction_impl.go index 031c7311e1..a48978160b 100644 --- a/pulsar/transaction_impl.go +++ b/pulsar/transaction_impl.go @@ -86,7 +86,7 @@ func (txn *transaction) GetState() TxnState { return TxnState(txn.state.Load()) } -func (txn *transaction) Commit(_ context.Context) error { +func (txn *transaction) Commit(ctx context.Context) error { if !(txn.state.CompareAndSwap(int32(TxnOpen), int32(TxnCommitting))) { txnState := txn.state.Load() return newError(InvalidStatus, txnStateErrorMessage(TxnOpen, TxnState(txnState))) @@ -117,7 +117,7 @@ func (txn *transaction) Commit(_ context.Context) error { return err } -func (txn *transaction) Abort(_ context.Context) error { +func (txn *transaction) Abort(ctx context.Context) error { if !(txn.state.CompareAndSwap(int32(TxnOpen), int32(TxnAborting))) { txnState := txn.state.Load() return newError(InvalidStatus, txnStateErrorMessage(TxnOpen, TxnState(txnState)))