Repository: ignite Updated Branches: refs/heads/ignite-8446 7d442307e -> 96f30a5e4
IGNITE-8783 Signed-off-by: Anton Vinogradov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96f30a5e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96f30a5e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96f30a5e Branch: refs/heads/ignite-8446 Commit: 96f30a5e4d4c96eb70282b0e697d0424a6f2d647 Parents: 7d44230 Author: Anton Vinogradov <[email protected]> Authored: Mon Jul 16 19:04:56 2018 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Jul 16 19:04:56 2018 +0300 ---------------------------------------------------------------------- .../events/TransactionStateChangedEvent.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../transactions/TransactionEventProxyImpl.java | 32 +++++++++----------- .../TxRollbackOnIncorrectParamsTest.java | 10 +++--- 4 files changed, 23 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/96f30a5e/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java index 6c2998f..cf6e099 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/TransactionStateChangedEvent.java @@ -47,7 +47,8 @@ public class TransactionStateChangedEvent extends EventAdapter { } /** - * + * Provides transaction proxy allows all 'get' operations such as {@link Transaction#label()} + * and also {@link Transaction#setRollbackOnly()} method. */ public Transaction tx() { return tx; http://git-wip-us.apache.org/repos/asf/ignite/blob/96f30a5e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index e40d8de..59bc349 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1214,7 +1214,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement cctx.discovery().localNode(), null, type, - new TransactionEventProxyImpl(xid(), (GridNearTxLocal)this))); + new TransactionEventProxyImpl((GridNearTxLocal)this))); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/96f30a5e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEventProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEventProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEventProxyImpl.java index d36bfe7..7e6c0fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEventProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEventProxyImpl.java @@ -58,15 +58,13 @@ public class TransactionEventProxyImpl implements TransactionProxy, Externalizab } /** - * @param xid Xid. * @param tx Tx proxy. */ - public TransactionEventProxyImpl(IgniteUuid xid, GridNearTxLocal tx) { - assert xid != null; + public TransactionEventProxyImpl(GridNearTxLocal tx) { assert tx != null; - this.xid = xid; this.tx = tx; + this.xid = tx.xid(); } /** {@inheritDoc} */ @@ -121,7 +119,7 @@ public class TransactionEventProxyImpl implements TransactionProxy, Externalizab /** {@inheritDoc} */ @Override public long timeout(long timeout) { - return tx().timeout(timeout); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -136,37 +134,37 @@ public class TransactionEventProxyImpl implements TransactionProxy, Externalizab /** {@inheritDoc} */ @Override public void commit() throws IgniteException { - tx().commit(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public IgniteFuture<Void> commitAsync() throws IgniteException { - return tx().commitAsync(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public void close() throws IgniteException { - tx().close(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public void rollback() throws IgniteException { - tx().rollback(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public IgniteFuture<Void> rollbackAsync() throws IgniteException { - return tx().rollbackAsync(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public void resume() throws IgniteException { - tx().resume(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public void suspend() throws IgniteException { - tx().suspend(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -176,17 +174,17 @@ public class TransactionEventProxyImpl implements TransactionProxy, Externalizab /** {@inheritDoc} */ @Override public IgniteAsyncSupport withAsync() { - return tx().withAsync(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public boolean isAsync() { - return tx().isAsync(); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public <R> IgniteFuture<R> future() { - return tx().future(); + throw new UnsupportedOperationException(); } /** @@ -197,10 +195,10 @@ public class TransactionEventProxyImpl implements TransactionProxy, Externalizab if (tx == null) throw new IgniteException("Operation allowed only inside remote filter or " + "inside local listener registered on originating node. " + - "Only xid() operation allowed in other cases. "); + "Only xid() operation allowed in other case. "); if (proxy == null) - proxy = tx.rollbackOnlyProxy(); + proxy = tx.proxy(); return proxy; } http://git-wip-us.apache.org/repos/asf/ignite/blob/96f30a5e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java index 8dd777d..8aafa8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnIncorrectParamsTest.java @@ -53,7 +53,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { Transaction tx = evt.tx(); if (tx.timeout() < 200) - tx.rollback(); + tx.setRollbackOnly(); return true; }, EVT_TX_STARTED); @@ -105,7 +105,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { Transaction tx = evt.tx(); if (tx.label() == null) - tx.rollback(); + tx.setRollbackOnly(); return true; }, EVT_TX_STARTED); @@ -149,7 +149,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { Transaction tx = evt.tx(); if (tx.label() == null) - tx.rollback(); + tx.setRollbackOnly(); return true; }, @@ -209,7 +209,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { Transaction tx = evt.tx(); if (tx.timeout() == 0) - tx.rollback(); + tx.setRollbackOnly(); return true; }, @@ -274,7 +274,7 @@ public class TxRollbackOnIncorrectParamsTest extends GridCommonAbstractTest { Transaction tx = evt.tx(); try { - tx.rollback(); + tx.setRollbackOnly(); } catch (IgniteException ignored) { alreadyRolledBack.set(rollbackFailed.getAndSet(true));
