You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2014/12/22 00:04:21 UTC
[28/46] incubator-ignite git commit: GG-9141 - Renaming
GG-9141 - Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1a5b391
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1a5b391
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1a5b391
Branch: refs/heads/ignite-1
Commit: a1a5b391e1a914fc613bc07b26940ee8573981f4
Parents: 8017811
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Dec 19 18:07:10 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Dec 19 18:07:10 2014 -0800
----------------------------------------------------------------------
.../GridCacheTxHeuristicException.java | 43 --------------------
.../GridCacheTxOptimisticException.java | 39 ------------------
.../GridCacheTxRollbackException.java | 39 ------------------
.../GridCacheTxSynchronization.java | 38 -----------------
.../GridCacheTxTimeoutException.java | 39 ------------------
.../apache/ignite/transactions/IgniteTx.java | 4 +-
.../IgniteTxHeuristicException.java | 43 ++++++++++++++++++++
.../IgniteTxOptimisticException.java | 39 ++++++++++++++++++
.../transactions/IgniteTxRollbackException.java | 39 ++++++++++++++++++
.../transactions/IgniteTxSynchronization.java | 38 +++++++++++++++++
.../transactions/IgniteTxTimeoutException.java | 39 ++++++++++++++++++
.../java/org/gridgain/grid/cache/GridCache.java | 10 ++---
.../processors/cache/GridCacheAdapter.java | 10 ++---
.../processors/cache/GridCacheProxyImpl.java | 6 +--
.../kernal/processors/cache/GridCacheTxEx.java | 4 +-
.../processors/cache/GridCacheTxHandler.java | 18 ++++----
.../cache/GridCacheTxLocalAdapter.java | 18 ++++----
.../processors/cache/GridCacheTxManager.java | 24 +++++------
.../GridCacheDataStructuresManager.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 6 +--
.../distributed/dht/GridDhtTxFinishFuture.java | 4 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 22 +++++-----
.../near/GridNearTransactionalCache.java | 2 +-
.../near/GridNearTxFinishFuture.java | 4 +-
.../cache/distributed/near/GridNearTxLocal.java | 18 ++++----
.../near/GridNearTxPrepareFuture.java | 12 +++---
.../cache/local/GridLocalTxFuture.java | 14 +++----
.../grid/util/future/GridCompoundFuture.java | 2 +-
.../GridCacheGroupLockAbstractSelfTest.java | 2 +-
.../GridCacheVariableTopologySelfTest.java | 2 +-
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 12 +++---
.../IgniteTxMultiThreadedAbstractTest.java | 2 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 10 ++---
.../GridCacheAbstractNodeRestartSelfTest.java | 2 +-
.../GridCacheNodeFailureAbstractTest.java | 2 +-
.../IgniteTxTimeoutAbstractTest.java | 2 +-
.../near/GridCacheNearMultiGetSelfTest.java | 2 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 4 +-
40 files changed, 311 insertions(+), 311 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxHeuristicException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxHeuristicException.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxHeuristicException.java
deleted file mode 100644
index 1813d72..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxHeuristicException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.apache.ignite.*;
-
-/**
- * Exception thrown whenever grid transaction enters an unknown state.
- * This exception is usually thrown whenever commit partially succeeds.
- * Cache will still resolve this situation automatically to ensure data
- * integrity, by invalidating all values participating in this transaction
- * on remote nodes.
- */
-public class GridCacheTxHeuristicException extends IgniteCheckedException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates new heuristic exception with given error message.
- *
- * @param msg Error message.
- */
- public GridCacheTxHeuristicException(String msg) {
- super(msg);
- }
-
- /**
- * Creates new heuristic exception with given error message and optional nested exception.
- *
- * @param msg Error message.
- * @param cause Optional nested exception (can be <tt>null</tt>).
- */
- public GridCacheTxHeuristicException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxOptimisticException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxOptimisticException.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxOptimisticException.java
deleted file mode 100644
index 0799ff4..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxOptimisticException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.apache.ignite.*;
-
-/**
- * Exception thrown whenever grid transactions fail optimistically.
- */
-public class GridCacheTxOptimisticException extends IgniteCheckedException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates new optimistic exception with given error message.
- *
- * @param msg Error message.
- */
- public GridCacheTxOptimisticException(String msg) {
- super(msg);
- }
-
- /**
- * Creates new optimistic exception with given error message and optional nested exception.
- *
- * @param msg Error message.
- * @param cause Optional nested exception (can be <tt>null</tt>).
- */
- public GridCacheTxOptimisticException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxRollbackException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxRollbackException.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxRollbackException.java
deleted file mode 100644
index 6823c03..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxRollbackException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.apache.ignite.*;
-
-/**
- * Exception thrown whenever grid transactions has been automatically rolled back.
- */
-public class GridCacheTxRollbackException extends IgniteCheckedException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates new rollback exception with given error message.
- *
- * @param msg Error message.
- */
- public GridCacheTxRollbackException(String msg) {
- super(msg);
- }
-
- /**
- * Creates new rollback exception with given error message and optional nested exception.
- *
- * @param msg Error message.
- * @param cause Optional nested exception (can be <tt>null</tt>).
- */
- public GridCacheTxRollbackException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
deleted file mode 100644
index bd177a4..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.gridgain.grid.cache.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Synchronization callback for transaction. You can subscribe to receive transaction
- * state change callbacks by registering transaction synchronization via
- * {@link GridCache#txSynchronize(GridCacheTxSynchronization)} method.
- */
-public interface GridCacheTxSynchronization {
- /**
- * State change callback for transaction. Note that unless transaction has been
- * completed, it is possible to mark it for <tt>rollbackOnly</tt> by calling
- * {@link IgniteTx#setRollbackOnly()} on the passed in transaction.
- * You can check the return value of {@link IgniteTx#setRollbackOnly() setRollbackOnly()}
- * method to see if transaction was indeed marked for rollback or not.
- *
- * @param prevState Previous state of the transaction. If transaction has just been
- * started, then previous state is {@code null}.
- * @param newState New state of the transaction. In majority of the cases this will be the
- * same as {@link IgniteTx#state() tx.state()}, but it is also possible
- * that transaction may be marked for rollback concurrently with this method
- * invocation, and in that case <tt>newState</tt> reflects the actual state of the
- * transition this callback is associated with.
- * @param tx Transaction whose state has changed.
- */
- public void onStateChanged(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteTx tx);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxTimeoutException.java
deleted file mode 100644
index 63828c8..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxTimeoutException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.apache.ignite.*;
-
-/**
- * Exception thrown whenever grid transactions time out.
- */
-public class GridCacheTxTimeoutException extends IgniteCheckedException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Creates new timeout exception with given error message.
- *
- * @param msg Error message.
- */
- public GridCacheTxTimeoutException(String msg) {
- super(msg);
- }
-
- /**
- * Creates new timeout exception with given error message and optional nested exception.
- *
- * @param msg Error message.
- * @param cause Optional nested exception (can be <tt>null</tt>).
- */
- public GridCacheTxTimeoutException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
index 9bd287f..c3466f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
@@ -46,7 +46,7 @@ import java.util.*;
* Read access with this level happens the same way as with {@link IgniteTxIsolation#REPEATABLE_READ} level.
* However, in {@link IgniteTxConcurrency#OPTIMISTIC} mode, if some transactions cannot be serially isolated
* from each other, then one winner will be picked and the other transactions in conflict will result in
- * {@link GridCacheTxOptimisticException} being thrown.
+ * {@link IgniteTxOptimisticException} being thrown.
* </li>
* </ul>
* <p>
@@ -181,7 +181,7 @@ public interface IgniteTx extends GridMetadataAware, AutoCloseable {
/**
* Gets timeout value in milliseconds for this transaction. If transaction times
- * out prior to it's completion, {@link GridCacheTxTimeoutException} will be thrown.
+ * out prior to it's completion, {@link IgniteTxTimeoutException} will be thrown.
*
* @return Transaction timeout value.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java
new file mode 100644
index 0000000..23b7da0
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxHeuristicException.java
@@ -0,0 +1,43 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.apache.ignite.*;
+
+/**
+ * Exception thrown whenever grid transaction enters an unknown state.
+ * This exception is usually thrown whenever commit partially succeeds.
+ * Cache will still resolve this situation automatically to ensure data
+ * integrity, by invalidating all values participating in this transaction
+ * on remote nodes.
+ */
+public class IgniteTxHeuristicException extends IgniteCheckedException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Creates new heuristic exception with given error message.
+ *
+ * @param msg Error message.
+ */
+ public IgniteTxHeuristicException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates new heuristic exception with given error message and optional nested exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be <tt>null</tt>).
+ */
+ public IgniteTxHeuristicException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java
new file mode 100644
index 0000000..5e6d79a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxOptimisticException.java
@@ -0,0 +1,39 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.apache.ignite.*;
+
+/**
+ * Exception thrown whenever grid transactions fail optimistically.
+ */
+public class IgniteTxOptimisticException extends IgniteCheckedException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Creates new optimistic exception with given error message.
+ *
+ * @param msg Error message.
+ */
+ public IgniteTxOptimisticException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates new optimistic exception with given error message and optional nested exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be <tt>null</tt>).
+ */
+ public IgniteTxOptimisticException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java
new file mode 100644
index 0000000..c07857c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxRollbackException.java
@@ -0,0 +1,39 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.apache.ignite.*;
+
+/**
+ * Exception thrown whenever grid transactions has been automatically rolled back.
+ */
+public class IgniteTxRollbackException extends IgniteCheckedException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Creates new rollback exception with given error message.
+ *
+ * @param msg Error message.
+ */
+ public IgniteTxRollbackException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates new rollback exception with given error message and optional nested exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be <tt>null</tt>).
+ */
+ public IgniteTxRollbackException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
new file mode 100644
index 0000000..fee4f37
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
@@ -0,0 +1,38 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.gridgain.grid.cache.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Synchronization callback for transaction. You can subscribe to receive transaction
+ * state change callbacks by registering transaction synchronization via
+ * {@link GridCache#txSynchronize(IgniteTxSynchronization)} method.
+ */
+public interface IgniteTxSynchronization {
+ /**
+ * State change callback for transaction. Note that unless transaction has been
+ * completed, it is possible to mark it for <tt>rollbackOnly</tt> by calling
+ * {@link IgniteTx#setRollbackOnly()} on the passed in transaction.
+ * You can check the return value of {@link IgniteTx#setRollbackOnly() setRollbackOnly()}
+ * method to see if transaction was indeed marked for rollback or not.
+ *
+ * @param prevState Previous state of the transaction. If transaction has just been
+ * started, then previous state is {@code null}.
+ * @param newState New state of the transaction. In majority of the cases this will be the
+ * same as {@link IgniteTx#state() tx.state()}, but it is also possible
+ * that transaction may be marked for rollback concurrently with this method
+ * invocation, and in that case <tt>newState</tt> reflects the actual state of the
+ * transition this callback is associated with.
+ * @param tx Transaction whose state has changed.
+ */
+ public void onStateChanged(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteTx tx);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java
new file mode 100644
index 0000000..51169c2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxTimeoutException.java
@@ -0,0 +1,39 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.apache.ignite.*;
+
+/**
+ * Exception thrown whenever grid transactions time out.
+ */
+public class IgniteTxTimeoutException extends IgniteCheckedException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Creates new timeout exception with given error message.
+ *
+ * @param msg Error message.
+ */
+ public IgniteTxTimeoutException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Creates new timeout exception with given error message and optional nested exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be <tt>null</tt>).
+ */
+ public IgniteTxTimeoutException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
index 49bee3d..2b652ac 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
@@ -68,23 +68,23 @@ public interface GridCache<K, V> extends GridCacheProjection<K, V> {
*
* @param syncs Transaction synchronizations to register.
*/
- public void txSynchronize(@Nullable GridCacheTxSynchronization syncs);
+ public void txSynchronize(@Nullable IgniteTxSynchronization syncs);
/**
* Removes transaction synchronizations.
*
* @param syncs Transactions synchronizations to remove.
- * @see #txSynchronize(GridCacheTxSynchronization)
+ * @see #txSynchronize(IgniteTxSynchronization)
*/
- public void txUnsynchronize(@Nullable GridCacheTxSynchronization syncs);
+ public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs);
/**
* Gets registered transaction synchronizations.
*
* @return Registered transaction synchronizations.
- * @see #txSynchronize(GridCacheTxSynchronization)
+ * @see #txSynchronize(IgniteTxSynchronization)
*/
- public Collection<GridCacheTxSynchronization> txSynchronizations();
+ public Collection<IgniteTxSynchronization> txSynchronizations();
/**
* Gets affinity service to provide information about data partitioning
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 5571ffd..643ec03 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -3178,17 +3178,17 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Override public void txSynchronize(GridCacheTxSynchronization syncs) {
+ @Override public void txSynchronize(IgniteTxSynchronization syncs) {
ctx.tm().addSynchronizations(syncs);
}
/** {@inheritDoc} */
- @Override public void txUnsynchronize(GridCacheTxSynchronization syncs) {
+ @Override public void txUnsynchronize(IgniteTxSynchronization syncs) {
ctx.tm().removeSynchronizations(syncs);
}
/** {@inheritDoc} */
- @Override public Collection<GridCacheTxSynchronization> txSynchronizations() {
+ @Override public Collection<IgniteTxSynchronization> txSynchronizations() {
return ctx.tm().synchronizations();
}
@@ -3631,14 +3631,14 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
return t;
}
- catch (GridInterruptedException | GridCacheTxHeuristicException | GridCacheTxRollbackException e) {
+ catch (GridInterruptedException | IgniteTxHeuristicException | IgniteTxRollbackException e) {
throw e;
}
catch (IgniteCheckedException e) {
try {
tx.rollback();
- e = new GridCacheTxRollbackException("Transaction has been rolled back: " +
+ e = new IgniteTxRollbackException("Transaction has been rolled back: " +
tx.xid(), e);
}
catch (IgniteCheckedException | AssertionError | RuntimeException e1) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
index 6addcbe..812336c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
@@ -149,7 +149,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public void txSynchronize(@Nullable GridCacheTxSynchronization syncs) {
+ @Override public void txSynchronize(@Nullable IgniteTxSynchronization syncs) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
@@ -161,7 +161,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public void txUnsynchronize(@Nullable GridCacheTxSynchronization syncs) {
+ @Override public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
@@ -173,7 +173,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public Collection<GridCacheTxSynchronization> txSynchronizations() {
+ @Override public Collection<IgniteTxSynchronization> txSynchronizations() {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
index 3984e4c..2861d66 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
@@ -479,9 +479,9 @@ public interface GridCacheTxEx<K, V> extends IgniteTx, GridTimeoutObject {
* Gets allowed remaining time for this transaction.
*
* @return Remaining time.
- * @throws GridCacheTxTimeoutException If transaction timed out.
+ * @throws IgniteTxTimeoutException If transaction timed out.
*/
- public long remainingTime() throws GridCacheTxTimeoutException;
+ public long remainingTime() throws IgniteTxTimeoutException;
/**
* @return Alternate transaction versions.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index c86ec28..47631e0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -192,7 +192,7 @@ public class GridCacheTxHandler<K, V> {
if (tx != null)
tx.setRollbackOnly(); // Just in case.
- if (!(e instanceof GridCacheTxOptimisticException))
+ if (!(e instanceof IgniteTxOptimisticException))
U.error(log, "Failed to prepare DHT transaction: " + tx, e);
}
@@ -296,7 +296,7 @@ public class GridCacheTxHandler<K, V> {
catch (IgniteCheckedException e) {
tx0.setRollbackOnly(); // Just in case.
- if (!(e instanceof GridCacheTxOptimisticException))
+ if (!(e instanceof IgniteTxOptimisticException))
U.error(log, "Failed to prepare DHT transaction: " + tx0, e);
}
}
@@ -518,7 +518,7 @@ public class GridCacheTxHandler<K, V> {
req.taskNameHash()));
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Attempt to start a completed transaction: " + req);
+ throw new IgniteTxRollbackException("Attempt to start a completed transaction: " + req);
tx.topologyVersion(req.topologyVersion());
}
@@ -654,9 +654,9 @@ public class GridCacheTxHandler<K, V> {
res.invalidPartitions(dhtTx.invalidPartitions());
}
catch (IgniteCheckedException e) {
- if (e instanceof GridCacheTxRollbackException)
+ if (e instanceof IgniteTxRollbackException)
U.error(log, "Transaction was rolled back before prepare completed: " + dhtTx, e);
- else if (e instanceof GridCacheTxOptimisticException) {
+ else if (e instanceof IgniteTxOptimisticException) {
if (log.isDebugEnabled())
log.debug("Optimistic failure for remote transaction (will rollback): " + dhtTx);
}
@@ -733,7 +733,7 @@ public class GridCacheTxHandler<K, V> {
nearTx.syncRollback(req.syncRollback());
}
}
- catch (GridCacheTxRollbackException e) {
+ catch (IgniteTxRollbackException e) {
if (log.isDebugEnabled())
log.debug("Received finish request for completed transaction (will ignore) [req=" + req + ", err=" +
e.getMessage() + ']');
@@ -1044,7 +1044,7 @@ public class GridCacheTxHandler<K, V> {
tx = ctx.tm().onCreated(tx);
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Attempt to start a completed transaction: " + tx);
+ throw new IgniteTxRollbackException("Attempt to start a completed transaction: " + tx);
}
}
else
@@ -1133,7 +1133,7 @@ public class GridCacheTxHandler<K, V> {
tx = ctx.tm().onCreated(tx);
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Failed to acquire lock " +
+ throw new IgniteTxRollbackException("Failed to acquire lock " +
"(transaction has been completed): " + req.version());
}
@@ -1273,7 +1273,7 @@ public class GridCacheTxHandler<K, V> {
tx = ctx.tm().onCreated(tx);
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Failed to acquire lock " +
+ throw new IgniteTxRollbackException("Failed to acquire lock " +
"(transaction has been completed): " + req.version());
if (!marked)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
index 837b9dd..003315b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
@@ -334,7 +334,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
public void userPrepare() throws IgniteCheckedException {
if (state() != PREPARING) {
if (timedOut())
- throw new GridCacheTxTimeoutException("Transaction timed out: " + this);
+ throw new IgniteTxTimeoutException("Transaction timed out: " + this);
IgniteTxState state = state();
@@ -565,7 +565,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
if (state != COMMITTING) {
if (timedOut())
- throw new GridCacheTxTimeoutException("Transaction timed out: " + this);
+ throw new IgniteTxTimeoutException("Transaction timed out: " + this);
setRollbackOnly();
@@ -819,7 +819,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
throw ex;
}
else {
- IgniteCheckedException err = new GridCacheTxHeuristicException("Failed to locally write to cache " +
+ IgniteCheckedException err = new IgniteTxHeuristicException("Failed to locally write to cache " +
"(all transaction entries will be invalidated, however there was a window when " +
"entries for this transaction were visible to others): " + this, ex);
@@ -2643,23 +2643,23 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
protected void checkValid() throws IgniteCheckedException {
if (isRollbackOnly()) {
if (timedOut())
- throw new GridCacheTxTimeoutException("Cache transaction timed out: " + this);
+ throw new IgniteTxTimeoutException("Cache transaction timed out: " + this);
IgniteTxState state = state();
if (state == ROLLING_BACK || state == ROLLED_BACK)
- throw new GridCacheTxRollbackException("Cache transaction is marked as rollback-only " +
+ throw new IgniteTxRollbackException("Cache transaction is marked as rollback-only " +
"(will be rolled back automatically): " + this);
if (state == UNKNOWN)
- throw new GridCacheTxHeuristicException("Cache transaction is in unknown state " +
+ throw new IgniteTxHeuristicException("Cache transaction is in unknown state " +
"(remote transactions will be invalidated): " + this);
throw new IgniteCheckedException("Cache transaction marked as rollback-only: " + this);
}
if (remainingTime() == 0 && setRollbackOnly())
- throw new GridCacheTxTimeoutException("Cache transaction timed out " +
+ throw new IgniteTxTimeoutException("Cache transaction timed out " +
"(was rolled back automatically): " + this);
}
@@ -2983,7 +2983,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
if (!locked) {
setRollbackOnly();
- final GridClosureException ex = new GridClosureException(new GridCacheTxTimeoutException("Failed to " +
+ final GridClosureException ex = new GridClosureException(new IgniteTxTimeoutException("Failed to " +
"acquire lock within provided timeout for transaction [timeout=" + timeout() +
", tx=" + this + ']'));
@@ -3063,7 +3063,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
throw new GridClosureException(e);
if (!locked)
- throw new GridClosureException(new GridCacheTxTimeoutException("Failed to acquire lock " +
+ throw new GridClosureException(new IgniteTxTimeoutException("Failed to acquire lock " +
"within provided timeout for transaction [timeout=" + timeout() + ", tx=" + this + ']'));
IgniteFuture<T> fut = postLock();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index dc35d47..7645f75 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -89,7 +89,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
private GridCacheTxCommitBuffer<K, V> pessimisticRecoveryBuf;
/** Transaction synchronizations. */
- private final Collection<GridCacheTxSynchronization> syncs =
+ private final Collection<IgniteTxSynchronization> syncs =
new GridConcurrentHashSet<>();
/** Transaction finish synchronizer. */
@@ -212,7 +212,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
"crashed or left grid: " + CU.txString(tx));
}
}
- catch (GridCacheTxOptimisticException ignore) {
+ catch (IgniteTxOptimisticException ignore) {
if (log.isDebugEnabled())
log.debug("Optimistic failure while invalidating transaction (will rollback): " +
tx.xidVersion());
@@ -730,7 +730,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
public void prepareTx(GridCacheTxEx<K, V> tx) throws IgniteCheckedException {
if (tx.state() == MARKED_ROLLBACK) {
if (tx.timedOut())
- throw new GridCacheTxTimeoutException("Transaction timed out: " + this);
+ throw new IgniteTxTimeoutException("Transaction timed out: " + this);
throw new IgniteCheckedException("Transaction is marked for rollback: " + tx);
}
@@ -738,7 +738,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
if (tx.remainingTime() == 0) {
tx.setRollbackOnly();
- throw new GridCacheTxTimeoutException("Transaction timed out: " + this);
+ throw new IgniteTxTimeoutException("Transaction timed out: " + this);
}
boolean txSerializableEnabled = cctx.txConfig().isTxSerializableEnabled();
@@ -799,7 +799,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
if (GridFunc.intersects(committedTx.writeSet(), readSet)) {
tx.setRollbackOnly();
- throw new GridCacheTxOptimisticException("Failed to prepare transaction " +
+ throw new IgniteTxOptimisticException("Failed to prepare transaction " +
"(committed vs. read-set conflict): " + tx);
}
}
@@ -846,7 +846,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
tx.setRollbackOnly();
- throw new GridCacheTxOptimisticException(
+ throw new IgniteTxOptimisticException(
"Failed to prepare transaction (read-set/write-set conflict): " + tx);
}
}
@@ -859,7 +859,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
if (!lockMultiple(tx, tx.optimisticLockEntries())) {
tx.setRollbackOnly();
- throw new GridCacheTxOptimisticException("Failed to prepare transaction (lock conflict): " + tx);
+ throw new IgniteTxOptimisticException("Failed to prepare transaction (lock conflict): " + tx);
}
}
@@ -1651,7 +1651,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
/**
* @param sync Transaction synchronizations to add.
*/
- public void addSynchronizations(GridCacheTxSynchronization... sync) {
+ public void addSynchronizations(IgniteTxSynchronization... sync) {
if (F.isEmpty(sync))
return;
@@ -1661,7 +1661,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
/**
* @param sync Transaction synchronizations to remove.
*/
- public void removeSynchronizations(GridCacheTxSynchronization... sync) {
+ public void removeSynchronizations(IgniteTxSynchronization... sync) {
if (F.isEmpty(sync))
return;
@@ -1671,7 +1671,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
/**
* @return Registered transaction synchronizations
*/
- public Collection<GridCacheTxSynchronization> synchronizations() {
+ public Collection<IgniteTxSynchronization> synchronizations() {
return Collections.unmodifiableList(new LinkedList<>(syncs));
}
@@ -1682,7 +1682,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
*/
public void onTxStateChange(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteTx tx) {
// Notify synchronizations.
- for (GridCacheTxSynchronization s : syncs)
+ for (IgniteTxSynchronization s : syncs)
s.onStateChanged(prevState, newState, tx);
}
@@ -2197,7 +2197,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
try {
t.get();
}
- catch (GridCacheTxOptimisticException ignore) {
+ catch (IgniteTxOptimisticException ignore) {
if (log.isDebugEnabled())
log.debug("Optimistic failure while committing prepared transaction (will rollback): " +
tx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index d34ad15..b121039 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -1314,7 +1314,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
catch (ClusterGroupEmptyException e) {
throw new IgniteException(e);
}
- catch (GridCacheTxRollbackException | GridCachePartialUpdateException | ClusterTopologyException e) {
+ catch (IgniteTxRollbackException | GridCachePartialUpdateException | ClusterTopologyException e) {
if (cnt++ == MAX_UPDATE_RETRIES)
throw e;
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 4e628ec..decad36 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -203,7 +203,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
tx = ctx.tm().onCreated(tx);
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Failed to acquire lock (transaction " +
+ throw new IgniteTxRollbackException("Failed to acquire lock (transaction " +
"has been completed) [ver=" + req.version() + ", tx=" + tx + ']');
}
@@ -391,13 +391,13 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
}
}
}
- catch (GridCacheTxRollbackException e) {
+ catch (IgniteTxRollbackException e) {
String err = "Failed processing DHT lock request (transaction has been completed): " + req;
U.error(log, err, e);
res = new GridDhtLockResponse<>(ctx.cacheId(), req.version(), req.futureId(), req.miniId(),
- new GridCacheTxRollbackException(err, e));
+ new IgniteTxRollbackException(err, e));
fail = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 5c77413..56593f5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -155,7 +155,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (err.compareAndSet(null, e)) {
boolean marked = tx.setRollbackOnly();
- if (e instanceof GridCacheTxRollbackException) {
+ if (e instanceof IgniteTxRollbackException) {
if (marked) {
try {
tx.rollback();
@@ -171,7 +171,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
try {
get();
}
- catch (GridCacheTxHeuristicException ignore) {
+ catch (IgniteTxHeuristicException ignore) {
// Future should complete with GridCacheTxHeuristicException.
}
catch (IgniteCheckedException err) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 20985b6..19b9ccc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -295,13 +295,13 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (!state(PREPARING)) {
if (setRollbackOnly()) {
if (timedOut())
- fut.onError(new GridCacheTxTimeoutException("Transaction timed out and was rolled back: " + this));
+ fut.onError(new IgniteTxTimeoutException("Transaction timed out and was rolled back: " + this));
else
fut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() +
", tx=" + this + ']'));
}
else
- fut.onError(new GridCacheTxRollbackException("Invalid transaction state for prepare [state=" + state()
+ fut.onError(new IgniteTxRollbackException("Invalid transaction state for prepare [state=" + state()
+ ", tx=" + this + ']'));
return fut;
@@ -379,14 +379,14 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.complete();
if (setRollbackOnly()) {
if (timedOut())
- fut.onError(new GridCacheTxTimeoutException("Transaction timed out and was rolled back: " +
+ fut.onError(new IgniteTxTimeoutException("Transaction timed out and was rolled back: " +
this));
else
fut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() +
", tx=" + this + ']'));
}
else
- fut.onError(new GridCacheTxRollbackException("Invalid transaction state for prepare [state=" +
+ fut.onError(new IgniteTxRollbackException("Invalid transaction state for prepare [state=" +
state() + ", tx=" + this + ']'));
return fut;
@@ -412,18 +412,18 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
else
fut.prepare(reads, writes, txNodes);
}
- catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) {
+ catch (IgniteTxTimeoutException | IgniteTxOptimisticException e) {
fut.onError(e);
}
catch (IgniteCheckedException e) {
setRollbackOnly();
- fut.onError(new GridCacheTxRollbackException("Failed to prepare transaction: " + this, e));
+ fut.onError(new IgniteTxRollbackException("Failed to prepare transaction: " + this, e));
try {
rollback();
}
- catch (GridCacheTxOptimisticException e1) {
+ catch (IgniteTxOptimisticException e1) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e1 + ']');
@@ -463,7 +463,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
else
fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed to optimistically prepare transaction [tx=" + this + ", e=" + e + ']');
@@ -487,7 +487,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(new IgniteCheckedException("Failed to commit transaction: " +
CU.txString(GridDhtTxLocal.this)));
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e + ']');
@@ -510,7 +510,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
else
fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e + ']');
@@ -548,7 +548,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
else
fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 196cc87..bdd83d5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -272,7 +272,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
tx = ctx.tm().onCreated(tx);
if (tx == null || !ctx.tm().onStarted(tx))
- throw new GridCacheTxRollbackException("Failed to acquire lock " +
+ throw new IgniteTxRollbackException("Failed to acquire lock " +
"(transaction has been completed): " + req.version());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 949e675..7695e07 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -159,7 +159,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (err.compareAndSet(null, e)) {
boolean marked = tx.setRollbackOnly();
- if (e instanceof GridCacheTxRollbackException) {
+ if (e instanceof IgniteTxRollbackException) {
if (marked) {
try {
tx.rollback();
@@ -210,7 +210,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
Throwable th = this.err.get();
if (super.onDone(tx, th != null ? th : err)) {
- if (error() instanceof GridCacheTxHeuristicException) {
+ if (error() instanceof IgniteTxHeuristicException) {
long topVer = this.tx.topologyVersion();
for (GridCacheTxEntry<K, V> e : this.tx.writeMap().values()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
index a26b5b2..fa00c49 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -691,14 +691,14 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
if (!state(PREPARING)) {
if (setRollbackOnly()) {
if (timedOut())
- pessimisticFut.onError(new GridCacheTxTimeoutException("Transaction timed out and was " +
+ pessimisticFut.onError(new IgniteTxTimeoutException("Transaction timed out and was " +
"rolled back: " + this));
else
pessimisticFut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" +
state() + ", tx=" + this + ']'));
}
else
- pessimisticFut.onError(new GridCacheTxRollbackException("Invalid transaction state for prepare " +
+ pessimisticFut.onError(new IgniteTxRollbackException("Invalid transaction state for prepare " +
"[state=" + state() + ", tx=" + this + ']'));
return fut;
@@ -870,7 +870,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
if (state() != PREPARING) {
if (timedOut())
return new GridFinishedFuture<>(cctx.kernalContext(),
- new GridCacheTxTimeoutException("Transaction timed out: " + this));
+ new IgniteTxTimeoutException("Transaction timed out: " + this));
setRollbackOnly();
@@ -898,18 +898,18 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
else
fut.prepare(reads, writes, txNodes);
}
- catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) {
+ catch (IgniteTxTimeoutException | IgniteTxOptimisticException e) {
fut.onError(e);
}
catch (IgniteCheckedException e) {
setRollbackOnly();
- fut.onError(new GridCacheTxRollbackException("Failed to prepare transaction: " + this, e));
+ fut.onError(new IgniteTxRollbackException("Failed to prepare transaction: " + this, e));
try {
rollback();
}
- catch (GridCacheTxOptimisticException e1) {
+ catch (IgniteTxOptimisticException e1) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e1 + ']');
@@ -959,7 +959,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
fut.finish();
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e + ']');
@@ -979,7 +979,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
fut.finish();
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e + ']');
@@ -1172,7 +1172,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
void onError(Throwable e) {
boolean marked = tx.setRollbackOnly();
- if (e instanceof GridCacheTxRollbackException) {
+ if (e instanceof IgniteTxRollbackException) {
if (marked) {
try {
tx.rollback();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index 0724e7d..8b6a693 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -178,12 +178,12 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
if (err.compareAndSet(null, e)) {
boolean marked = tx.setRollbackOnly();
- if (e instanceof GridCacheTxOptimisticException) {
+ if (e instanceof IgniteTxOptimisticException) {
assert nodeId != null : "Missing node ID for optimistic failure exception: " + e;
tx.removeKeysMapping(nodeId, mappings);
}
- if (e instanceof GridCacheTxRollbackException) {
+ if (e instanceof IgniteTxRollbackException) {
if (marked) {
try {
tx.rollback();
@@ -322,14 +322,14 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
if (!tx.state(PREPARING)) {
if (tx.setRollbackOnly()) {
if (tx.timedOut())
- onError(null, null, new GridCacheTxTimeoutException("Transaction timed out and " +
+ onError(null, null, new IgniteTxTimeoutException("Transaction timed out and " +
"was rolled back: " + this));
else
onError(null, null, new IgniteCheckedException("Invalid transaction state for prepare " +
"[state=" + tx.state() + ", tx=" + this + ']'));
}
else
- onError(null, null, new GridCacheTxRollbackException("Invalid transaction state for " +
+ onError(null, null, new IgniteTxRollbackException("Invalid transaction state for " +
"prepare [state=" + tx.state() + ", tx=" + this + ']'));
return;
@@ -345,7 +345,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
prepare0();
}
- catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) {
+ catch (IgniteTxTimeoutException | IgniteTxOptimisticException e) {
onError(cctx.localNodeId(), null, e);
}
catch (IgniteCheckedException e) {
@@ -357,7 +357,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
tx.rollbackAsync();
- onError(null, null, new GridCacheTxRollbackException(msg, e));
+ onError(null, null, new IgniteTxRollbackException(msg, e));
}
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
index 3e6a86b..e588cba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
@@ -144,7 +144,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V
* @param e Error.
*/
@SuppressWarnings({"TypeMayBeWeakened"})
- void onError(GridCacheTxOptimisticException e) {
+ void onError(IgniteTxOptimisticException e) {
if (err.compareAndSet(null, e)) {
tx.setRollbackOnly();
@@ -156,7 +156,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V
* @param e Error.
*/
@SuppressWarnings({"TypeMayBeWeakened"})
- void onError(GridCacheTxRollbackException e) {
+ void onError(IgniteTxRollbackException e) {
if (err.compareAndSet(null, e)) {
// Attempt rollback.
if (tx.setRollbackOnly()) {
@@ -183,7 +183,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V
GridCacheEntryEx<K, V> entry = txEntry.cached();
if (entry == null) {
- onError(new GridCacheTxRollbackException("Failed to find cache entry for " +
+ onError(new IgniteTxRollbackException("Failed to find cache entry for " +
"transaction key (will rollback) [key=" + txEntry.key() + ", tx=" + tx + ']'));
break;
@@ -232,7 +232,7 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V
GridCacheEntryEx<K,V> cached = txEntry.cached();
if (entry == null) {
- onError(new GridCacheTxRollbackException("Failed to find cache entry for " +
+ onError(new IgniteTxRollbackException("Failed to find cache entry for " +
"transaction key (will rollback) [key=" + txEntry.key() + ", tx=" + tx + ']'));
return true;
@@ -275,17 +275,17 @@ final class GridLocalTxFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V
onComplete();
}
- catch (GridCacheTxTimeoutException e) {
+ catch (IgniteTxTimeoutException e) {
onError(e);
}
catch (IgniteCheckedException e) {
if (tx.state() == UNKNOWN) {
- onError(new GridCacheTxHeuristicException("Commit only partially succeeded " +
+ onError(new IgniteTxHeuristicException("Commit only partially succeeded " +
"(entries will be invalidated on remote nodes once transaction timeout passes): " +
tx, e));
}
else {
- onError(new GridCacheTxRollbackException(
+ onError(new IgniteTxRollbackException(
"Failed to commit transaction (will attempt rollback): " + tx, e));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
index 49ec1ac..d394088 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridCompoundFuture.java
@@ -324,7 +324,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> {
throw e;
}
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (log.isDebugEnabled())
log.debug("Optimistic failure [fut=" + GridCompoundFuture.this + ", err=" + e + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index 23979f1..81c649c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@ -399,7 +399,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
return null;
}
- }, GridCacheTxHeuristicException.class, null);
+ }, IgniteTxHeuristicException.class, null);
}
finally {
unlockLatch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
index fc03465..0e084e5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java
@@ -129,7 +129,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest {
tx.commit();
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
info("Caught cache optimistic exception: " + e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java
index c6a9c09..4fac01e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java
@@ -227,7 +227,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
if (isTestDebug())
debug("Committed transaction [i=" + i + ", tx=" + tx + ']');
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) {
error("Received invalid optimistic failure.", e);
@@ -352,7 +352,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
debug("Rolled back transaction: " + tx);
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
tx.rollback();
log.warning("Rolled back transaction due to optimistic exception [tx=" + tx + ", e=" + e + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index 506a552..0be91f0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
/**
- * Tests that transaction is invalidated in case of {@link GridCacheTxHeuristicException}.
+ * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicException}.
*/
public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstractSelfTest {
/** Index SPI throwing exception. */
@@ -315,7 +315,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
fail("Transaction should fail.");
}
- catch (GridCacheTxHeuristicException e) {
+ catch (IgniteTxHeuristicException e) {
log.info("Expected exception: " + e);
}
@@ -390,7 +390,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
return null;
}
- }, GridCacheTxHeuristicException.class, null);
+ }, IgniteTxHeuristicException.class, null);
checkEmpty(key);
}
@@ -427,7 +427,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
return null;
}
- }, GridCacheTxHeuristicException.class, null);
+ }, IgniteTxHeuristicException.class, null);
checkEmpty(key);
}
@@ -474,7 +474,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
return null;
}
- }, GridCacheTxHeuristicException.class, null);
+ }, IgniteTxHeuristicException.class, null);
for (Integer key : m.keySet())
checkEmpty(key);
@@ -508,7 +508,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
return null;
}
- }, GridCacheTxHeuristicException.class, null);
+ }, IgniteTxHeuristicException.class, null);
checkEmpty(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
index 421f307..cf4a7b7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java
@@ -230,7 +230,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract
break;
}
- catch(GridCacheTxOptimisticException e) {
+ catch(IgniteTxOptimisticException e) {
log.info("Got error, will retry: " + e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index 443ef33..39eb728 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
/**
- * Tests that transaction is invalidated in case of {@link GridCacheTxHeuristicException}.
+ * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicException}.
*/
public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAbstractSelfTest {
/** Index SPI throwing exception. */
@@ -395,7 +395,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
return null;
}
- }, GridCacheTxRollbackException.class, null);
+ }, IgniteTxRollbackException.class, null);
checkValue(key, putBefore);
}
@@ -432,7 +432,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
return null;
}
- }, GridCacheTxRollbackException.class, null);
+ }, IgniteTxRollbackException.class, null);
checkValue(key, putBefore);
}
@@ -479,7 +479,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
return null;
}
- }, GridCacheTxRollbackException.class, null);
+ }, IgniteTxRollbackException.class, null);
for (Integer key : m.keySet())
checkValue(key, putBefore);
@@ -513,7 +513,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
return null;
}
- }, GridCacheTxRollbackException.class, null);
+ }, IgniteTxRollbackException.class, null);
checkValue(key, putBefore);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index f8d1574..941fb90 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -495,7 +495,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
cache.put(key, Integer.toString(key));
}
- catch (GridCacheTxRollbackException | ClusterTopologyException ignored) {
+ catch (IgniteTxRollbackException | ClusterTopologyException ignored) {
// It is ok if primary node leaves grid.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index dab4588..89b267f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -200,7 +200,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
checkCache.unlockAll(F.asList(KEY));
}
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
U.warn(log, "Optimistic transaction failure (will rollback) [msg=" + e.getMessage() + ", tx=" + tx + ']');
if (G.state(g.name()) == IgniteState.STARTED)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
index 7be173d..455f009 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
@@ -137,7 +137,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
assert false : "Timeout never happened for transaction: " + tx;
}
- catch (GridCacheTxTimeoutException e) {
+ catch (IgniteTxTimeoutException e) {
info("Received expected timeout exception [msg=" + e.getMessage() + ", tx=" + tx + ']');
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1a5b391/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 28b8dcc..72a4dce 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -256,7 +256,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
if (isTestDebug())
info("Committed transaction: " + tx);
}
- catch (GridCacheTxOptimisticException e) {
+ catch (IgniteTxOptimisticException e) {
if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) {
error("Received invalid optimistic failure.", e);