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:13 UTC
[20/46] incubator-ignite git commit: GG-9141 - Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 85702a7..28c56ee 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
@@ -2971,8 +2971,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
setRollbackOnly();
if (commit && commitAfterLock())
- return rollbackAsync().chain(new C1<IgniteFuture<GridCacheTx>, T>() {
- @Override public T apply(IgniteFuture<GridCacheTx> f) {
+ return rollbackAsync().chain(new C1<IgniteFuture<IgniteTx>, T>() {
+ @Override public T apply(IgniteFuture<IgniteTx> f) {
throw new GridClosureException(e);
}
});
@@ -2988,8 +2988,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
", tx=" + this + ']'));
if (commit && commitAfterLock())
- return rollbackAsync().chain(new C1<IgniteFuture<GridCacheTx>, T>() {
- @Override public T apply(IgniteFuture<GridCacheTx> f) {
+ return rollbackAsync().chain(new C1<IgniteFuture<IgniteTx>, T>() {
+ @Override public T apply(IgniteFuture<IgniteTx> f) {
throw ex;
}
});
@@ -3006,8 +3006,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
if (commit && commitAfterLock()) {
rollback = false;
- return commitAsync().chain(new CX1<IgniteFuture<GridCacheTx>, T>() {
- @Override public T applyx(IgniteFuture<GridCacheTx> f) throws IgniteCheckedException {
+ return commitAsync().chain(new CX1<IgniteFuture<IgniteTx>, T>() {
+ @Override public T applyx(IgniteFuture<IgniteTx> f) throws IgniteCheckedException {
f.get();
return r;
@@ -3021,8 +3021,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
}
catch (final IgniteCheckedException ex) {
if (commit && commitAfterLock())
- return rollbackAsync().chain(new C1<IgniteFuture<GridCacheTx>, T>() {
- @Override public T apply(IgniteFuture<GridCacheTx> f) {
+ return rollbackAsync().chain(new C1<IgniteFuture<IgniteTx>, T>() {
+ @Override public T apply(IgniteFuture<IgniteTx> f) {
throw new GridClosureException(ex);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 bf31af4..42f8364 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
@@ -505,10 +505,10 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
* @return Future that will be completed when all ongoing transactions are finished.
*/
public IgniteFuture<Boolean> finishTxs(long topVer) {
- GridCompoundFuture<GridCacheTx, Boolean> res =
+ GridCompoundFuture<IgniteTx, Boolean> res =
new GridCompoundFuture<>(context().kernalContext(),
- new IgniteReducer<GridCacheTx, Boolean>() {
- @Override public boolean collect(GridCacheTx e) {
+ new IgniteReducer<IgniteTx, Boolean>() {
+ @Override public boolean collect(IgniteTx e) {
return true;
}
@@ -660,7 +660,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
/**
* @return User transaction for current thread.
*/
- @Nullable public GridCacheTx userTx() {
+ @Nullable public IgniteTx userTx() {
GridCacheTxEx<K, V> tx = txContext();
if (tx != null && tx.user() && tx.state() == ACTIVE)
@@ -1680,7 +1680,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
* @param newState New state.
* @param tx Cache transaction.
*/
- public void onTxStateChange(@Nullable GridCacheTxState prevState, GridCacheTxState newState, GridCacheTx tx) {
+ public void onTxStateChange(@Nullable GridCacheTxState prevState, GridCacheTxState newState, IgniteTx tx) {
// Notify synchronizations.
for (GridCacheTxSynchronization s : syncs)
s.onStateChanged(prevState, newState, tx);
@@ -1981,8 +1981,8 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
final GridCacheTxEx<K, V> tx0 = tx;
- return tx.finishFuture().chain(new C1<IgniteFuture<GridCacheTx>, GridCacheCommittedTxInfo<K, V>>() {
- @Override public GridCacheCommittedTxInfo<K, V> apply(IgniteFuture<GridCacheTx> txFut) {
+ return tx.finishFuture().chain(new C1<IgniteFuture<IgniteTx>, GridCacheCommittedTxInfo<K, V>>() {
+ @Override public GridCacheCommittedTxInfo<K, V> apply(IgniteFuture<IgniteTx> txFut) {
GridCacheCommittedTxInfo<K, V> info = null;
if (tx0.state() == COMMITTED)
@@ -2178,7 +2178,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
/**
* Commit listener. Checks if commit succeeded and rollbacks if case of error.
*/
- private class CommitListener implements CI1<IgniteFuture<GridCacheTx>> {
+ private class CommitListener implements CI1<IgniteFuture<IgniteTx>> {
/** */
private static final long serialVersionUID = 0L;
@@ -2193,7 +2193,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
}
/** {@inheritDoc} */
- @Override public void apply(IgniteFuture<GridCacheTx> t) {
+ @Override public void apply(IgniteFuture<IgniteTx> t) {
try {
t.get();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java
deleted file mode 100644
index fe7c15b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxy.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache;
-
-import org.apache.ignite.transactions.*;
-
-/**
- * Marker interface for transaction proxy.
- */
-public interface GridCacheTxProxy extends GridCacheTx {
- // No-op.
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java
deleted file mode 100644
index 07ce436..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Cache transaction proxy.
- */
-public class GridCacheTxProxyImpl<K, V> implements GridCacheTxProxy, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Wrapped transaction. */
- @GridToStringInclude
- private GridCacheTxEx<K, V> tx;
-
- /** Gateway. */
- @GridToStringExclude
- private GridCacheSharedContext<K, V> cctx;
-
- /**
- * Empty constructor required for {@link Externalizable}.
- */
- public GridCacheTxProxyImpl() {
- // No-op.
- }
-
- /**
- * @param tx Transaction.
- */
- public GridCacheTxProxyImpl(GridCacheTxEx<K, V> tx, GridCacheSharedContext<K, V> cctx) {
- assert tx != null;
- assert cctx != null;
-
- this.tx = tx;
- this.cctx = cctx;
- }
-
- /**
- * Enters a call.
- */
- private void enter() {
- if (cctx.deploymentEnabled())
- cctx.deploy().onEnter();
-
- try {
- cctx.kernalContext().gateway().readLock();
- }
- catch (IllegalStateException e) {
- throw e;
- }
- catch (RuntimeException | Error e) {
- cctx.kernalContext().gateway().readUnlock();
-
- throw e;
- }
- }
-
- /**
- * Leaves a call.
- */
- private void leave() {
- try {
- CU.unwindEvicts(cctx);
- }
- finally {
- cctx.kernalContext().gateway().readUnlock();
- }
- }
-
- /** {@inheritDoc} */
- @Override public IgniteUuid xid() {
- return tx.xid();
- }
-
- /** {@inheritDoc} */
- @Override public UUID nodeId() {
- return tx.nodeId();
- }
-
- /** {@inheritDoc} */
- @Override public long threadId() {
- return tx.threadId();
- }
-
- /** {@inheritDoc} */
- @Override public long startTime() {
- return tx.startTime();
- }
-
- /** {@inheritDoc} */
- @Override public GridCacheTxIsolation isolation() {
- return tx.isolation();
- }
-
- /** {@inheritDoc} */
- @Override public GridCacheTxConcurrency concurrency() {
- return tx.concurrency();
- }
-
- /** {@inheritDoc} */
- @Override public boolean isInvalidate() {
- return tx.isInvalidate();
- }
-
- /** {@inheritDoc} */
- @Override public boolean implicit() {
- return tx.implicit();
- }
-
- /** {@inheritDoc} */
- @Override public long timeout() {
- return tx.timeout();
- }
-
- /** {@inheritDoc} */
- @Override public GridCacheTxState state() {
- return tx.state();
- }
-
- /** {@inheritDoc} */
- @Override public long timeout(long timeout) {
- return tx.timeout(timeout);
- }
-
- /** {@inheritDoc} */
- @Override public boolean setRollbackOnly() {
- enter();
-
- try {
- return tx.setRollbackOnly();
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public boolean isRollbackOnly() {
- enter();
-
- try {
- return tx.isRollbackOnly();
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void commit() throws IgniteCheckedException {
- enter();
-
- try {
- cctx.commitTxAsync(tx).get();
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void close() throws IgniteCheckedException {
- enter();
-
- try {
- cctx.endTx(tx);
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
- enter();
-
- try {
-
- return cctx.commitTxAsync(tx);
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void rollback() throws IgniteCheckedException {
- enter();
-
- try {
- cctx.rollbackTx(tx);
- }
- finally {
- leave();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void copyMeta(GridMetadataAware from) {
- tx.copyMeta(from);
- }
-
- /** {@inheritDoc} */
- @Override public void copyMeta(Map<String, ?> data) {
- tx.copyMeta(data);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 addMeta(String name, V1 val) {
- return tx.addMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 putMetaIfAbsent(String name, V1 val) {
- return tx.putMetaIfAbsent(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 putMetaIfAbsent(String name, Callable<V1> c) {
- return tx.putMetaIfAbsent(name, c);
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public <V1> V1 addMetaIfAbsent(String name, V1 val) {
- return tx.addMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> V1 addMetaIfAbsent(String name, @Nullable Callable<V1> c) {
- return tx.addMetaIfAbsent(name, c);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"RedundantTypeArguments"})
- @Override public <V1> V1 meta(String name) {
- return tx.<V1>meta(name);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"RedundantTypeArguments"})
- @Override public <V1> V1 removeMeta(String name) {
- return tx.<V1>removeMeta(name);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean removeMeta(String name, V1 val) {
- return tx.removeMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> Map<String, V1> allMeta() {
- return tx.allMeta();
- }
-
- /** {@inheritDoc} */
- @Override public boolean hasMeta(String name) {
- return tx.hasMeta(name);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean hasMeta(String name, V1 val) {
- return tx.hasMeta(name, val);
- }
-
- /** {@inheritDoc} */
- @Override public <V1> boolean replaceMeta(String name, V1 curVal, V1 newVal) {
- return tx.replaceMeta(name, curVal, newVal);
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(tx);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- tx = (GridCacheTxAdapter<K, V>)in.readObject();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridCacheTxProxyImpl.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
index e081126..dbd7c0f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
@@ -155,8 +155,8 @@ public class GridCacheUtils {
};
/** Converts transaction to XID. */
- private static final IgniteClosure<GridCacheTx, IgniteUuid> tx2xid = new C1<GridCacheTx, IgniteUuid>() {
- @Override public IgniteUuid apply(GridCacheTx tx) {
+ private static final IgniteClosure<IgniteTx, IgniteUuid> tx2xid = new C1<IgniteTx, IgniteUuid>() {
+ @Override public IgniteUuid apply(IgniteTx tx) {
return tx.xid();
}
@@ -796,7 +796,7 @@ public class GridCacheUtils {
/**
* @return Closure which converts transaction to xid.
*/
- public static IgniteClosure<GridCacheTx, IgniteUuid> tx2xid() {
+ public static IgniteClosure<IgniteTx, IgniteUuid> tx2xid() {
return tx2xid;
}
@@ -1198,7 +1198,7 @@ public class GridCacheUtils {
* @param isolation Isolation.
* @return New transaction.
*/
- public static GridCacheTx txStartInternal(GridCacheContext ctx, GridCacheProjection prj,
+ public static IgniteTx txStartInternal(GridCacheContext ctx, GridCacheProjection prj,
GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
assert ctx != null;
assert prj != null;
@@ -1212,7 +1212,7 @@ public class GridCacheUtils {
* @param tx Transaction.
* @return String view of all safe-to-print transaction properties.
*/
- public static String txString(@Nullable GridCacheTx tx) {
+ public static String txString(@Nullable IgniteTx tx) {
if (tx == null)
return "null";
@@ -1615,7 +1615,7 @@ public class GridCacheUtils {
public static <K, V> void inTx(GridCacheProjection<K, V> cache, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, IgniteInClosureX<GridCacheProjection<K ,V>> clo) throws IgniteCheckedException {
- try (GridCacheTx tx = cache.txStart(concurrency, isolation)) {
+ try (IgniteTx tx = cache.txStart(concurrency, isolation)) {
clo.applyx(cache);
tx.commit();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
index 043f702..981bdca 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
@@ -378,7 +378,7 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li
/** {@inheritDoc} */
@SuppressWarnings({"NullableProblems"})
- @Override public void loadAll(@Nullable GridCacheTx tx,
+ @Override public void loadAll(@Nullable IgniteTx tx,
@Nullable Collection<? extends K> keys, IgniteBiInClosure<K, V> c) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Store load all [keys=" + keys + ", tx=" + tx + ']');
@@ -421,7 +421,7 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li
}
/** {@inheritDoc} */
- @Override public V load(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public V load(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Store load [key=" + key + ", tx=" + tx + ']');
@@ -451,14 +451,14 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li
}
/** {@inheritDoc} */
- @Override public void putAll(@Nullable GridCacheTx tx, @Nullable Map<? extends K, ? extends V> map)
+ @Override public void putAll(@Nullable IgniteTx tx, @Nullable Map<? extends K, ? extends V> map)
throws IgniteCheckedException {
for (Map.Entry<? extends K, ? extends V> e : map.entrySet())
put(tx, e.getKey(), e.getValue());
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, K key, V val) throws IgniteCheckedException {
+ @Override public void put(@Nullable IgniteTx tx, K key, V val) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Store put [key=" + key + ", val=" + val + ", tx=" + tx + ']');
@@ -466,14 +466,14 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li
}
/** {@inheritDoc} */
- @Override public void removeAll(@Nullable GridCacheTx tx, @Nullable Collection<? extends K> keys)
+ @Override public void removeAll(@Nullable IgniteTx tx, @Nullable Collection<? extends K> keys)
throws IgniteCheckedException {
for (K key : keys)
remove(tx, key);
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public void remove(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Store remove [key=" + key + ", tx=" + tx + ']');
@@ -481,7 +481,7 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxy.java
new file mode 100644
index 0000000..19c8116
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxy.java
@@ -0,0 +1,19 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.kernal.processors.cache;
+
+import org.apache.ignite.transactions.*;
+
+/**
+ * Marker interface for transaction proxy.
+ */
+public interface IgniteTxProxy extends IgniteTx {
+ // No-op.
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
new file mode 100644
index 0000000..844bd44
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
@@ -0,0 +1,303 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.kernal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.transactions.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Cache transaction proxy.
+ */
+public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Wrapped transaction. */
+ @GridToStringInclude
+ private GridCacheTxEx<K, V> tx;
+
+ /** Gateway. */
+ @GridToStringExclude
+ private GridCacheSharedContext<K, V> cctx;
+
+ /**
+ * Empty constructor required for {@link Externalizable}.
+ */
+ public IgniteTxProxyImpl() {
+ // No-op.
+ }
+
+ /**
+ * @param tx Transaction.
+ */
+ public IgniteTxProxyImpl(GridCacheTxEx<K, V> tx, GridCacheSharedContext<K, V> cctx) {
+ assert tx != null;
+ assert cctx != null;
+
+ this.tx = tx;
+ this.cctx = cctx;
+ }
+
+ /**
+ * Enters a call.
+ */
+ private void enter() {
+ if (cctx.deploymentEnabled())
+ cctx.deploy().onEnter();
+
+ try {
+ cctx.kernalContext().gateway().readLock();
+ }
+ catch (IllegalStateException e) {
+ throw e;
+ }
+ catch (RuntimeException | Error e) {
+ cctx.kernalContext().gateway().readUnlock();
+
+ throw e;
+ }
+ }
+
+ /**
+ * Leaves a call.
+ */
+ private void leave() {
+ try {
+ CU.unwindEvicts(cctx);
+ }
+ finally {
+ cctx.kernalContext().gateway().readUnlock();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteUuid xid() {
+ return tx.xid();
+ }
+
+ /** {@inheritDoc} */
+ @Override public UUID nodeId() {
+ return tx.nodeId();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long threadId() {
+ return tx.threadId();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long startTime() {
+ return tx.startTime();
+ }
+
+ /** {@inheritDoc} */
+ @Override public GridCacheTxIsolation isolation() {
+ return tx.isolation();
+ }
+
+ /** {@inheritDoc} */
+ @Override public GridCacheTxConcurrency concurrency() {
+ return tx.concurrency();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isInvalidate() {
+ return tx.isInvalidate();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean implicit() {
+ return tx.implicit();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long timeout() {
+ return tx.timeout();
+ }
+
+ /** {@inheritDoc} */
+ @Override public GridCacheTxState state() {
+ return tx.state();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long timeout(long timeout) {
+ return tx.timeout(timeout);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean setRollbackOnly() {
+ enter();
+
+ try {
+ return tx.setRollbackOnly();
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isRollbackOnly() {
+ enter();
+
+ try {
+ return tx.isRollbackOnly();
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void commit() throws IgniteCheckedException {
+ enter();
+
+ try {
+ cctx.commitTxAsync(tx).get();
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() throws IgniteCheckedException {
+ enter();
+
+ try {
+ cctx.endTx(tx);
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
+ enter();
+
+ try {
+
+ return cctx.commitTxAsync(tx);
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void rollback() throws IgniteCheckedException {
+ enter();
+
+ try {
+ cctx.rollbackTx(tx);
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void copyMeta(GridMetadataAware from) {
+ tx.copyMeta(from);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void copyMeta(Map<String, ?> data) {
+ tx.copyMeta(data);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> V1 addMeta(String name, V1 val) {
+ return tx.addMeta(name, val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> V1 putMetaIfAbsent(String name, V1 val) {
+ return tx.putMetaIfAbsent(name, val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> V1 putMetaIfAbsent(String name, Callable<V1> c) {
+ return tx.putMetaIfAbsent(name, c);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public <V1> V1 addMetaIfAbsent(String name, V1 val) {
+ return tx.addMeta(name, val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> V1 addMetaIfAbsent(String name, @Nullable Callable<V1> c) {
+ return tx.addMetaIfAbsent(name, c);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"RedundantTypeArguments"})
+ @Override public <V1> V1 meta(String name) {
+ return tx.<V1>meta(name);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"RedundantTypeArguments"})
+ @Override public <V1> V1 removeMeta(String name) {
+ return tx.<V1>removeMeta(name);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> boolean removeMeta(String name, V1 val) {
+ return tx.removeMeta(name, val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> Map<String, V1> allMeta() {
+ return tx.allMeta();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean hasMeta(String name) {
+ return tx.hasMeta(name);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> boolean hasMeta(String name, V1 val) {
+ return tx.hasMeta(name, val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public <V1> boolean replaceMeta(String name, V1 curVal, V1 newVal) {
+ return tx.replaceMeta(name, curVal, newVal);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(tx);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ tx = (GridCacheTxAdapter<K, V>)in.readObject();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgniteTxProxyImpl.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
index d42ba00..10a2ad6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
@@ -73,7 +73,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #incrementAndGet()}. */
private final Callable<Long> incAndGetCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -104,7 +104,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #getAndIncrement()}. */
private final Callable<Long> getAndIncCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -135,7 +135,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #decrementAndGet()}. */
private final Callable<Long> decAndGetCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -166,7 +166,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #getAndDecrement()}. */
private final Callable<Long> getAndDecCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -331,7 +331,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalAddAndGet(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -369,7 +369,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalGetAndAdd(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -407,7 +407,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalGetAndSet(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -447,7 +447,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Boolean> internalCompareAndSet(final long expVal, final long newVal) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
index 908e28c..7d10060 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
@@ -186,7 +186,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicReferenceValue<T> ref = atomicView.get(key);
@@ -225,7 +225,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
final IgniteClosure<T, T> newValClos) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicReferenceValue<T> ref = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
index 80f7e09..ba25633 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
@@ -391,7 +391,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
private Callable<Long> internalUpdate(final long l, final boolean updated) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, seqView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, seqView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicSequenceValue seq = seqView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
index e4a0b55..51aaf45 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
@@ -212,7 +212,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicStampedValue<T, S> stmp = atomicView.get(key);
@@ -254,7 +254,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
final IgniteClosure<S, S> newStampClos) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicStampedValue<T, S> stmp = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
index 559bdbe..579b11c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
@@ -211,7 +211,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
internalLatch = CU.outTx(
new Callable<CountDownLatch>() {
@Override public CountDownLatch call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheCountDownLatchValue val = latchView.get(key);
@@ -310,7 +310,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
/** {@inheritDoc} */
@Override public Integer call() throws Exception {
- GridCacheTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheCountDownLatchValue latchVal = latchView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 3066811..8878f37 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
@@ -190,7 +190,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<GridCacheAtomicSequence>() {
@Override
public GridCacheAtomicSequence call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicSequenceValue seqVal = cast(dsView.get(key),
GridCacheAtomicSequenceValue.class);
@@ -308,7 +308,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<GridCacheAtomicLong>() {
@Override
public GridCacheAtomicLong call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicLongValue val = cast(dsView.get(key),
GridCacheAtomicLongValue.class);
@@ -404,7 +404,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<GridCacheAtomicReference<T>>() {
@Override
public GridCacheAtomicReference<T> call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicReferenceValue val = cast(dsView.get(key),
GridCacheAtomicReferenceValue.class);
@@ -503,7 +503,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<GridCacheAtomicStamped<T, S>>() {
@Override
public GridCacheAtomicStamped<T, S> call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicStampedValue val = cast(dsView.get(key),
GridCacheAtomicStampedValue.class);
@@ -774,7 +774,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<GridCacheCountDownLatch>() {
@Override public GridCacheCountDownLatch call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheCountDownLatchValue val = cast(dsView.get(key),
GridCacheCountDownLatchValue.class);
@@ -838,7 +838,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
@Override public Boolean call() throws Exception {
GridCacheInternal key = new GridCacheInternalKeyImpl(name);
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
// Check correctness type of removable object.
GridCacheCountDownLatchValue val =
cast(dsView.get(key), GridCacheCountDownLatchValue.class);
@@ -885,7 +885,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(
new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- try (GridCacheTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
// Check correctness type of removable object.
R val = cast(dsView.get(key), cls);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
index ef64d31..98720b2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
@@ -47,7 +47,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
while (true) {
try {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.transformAndCompute(queueKey, new AddClosure(id, 1));
if (idx != null) {
@@ -97,7 +97,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
T retVal;
while (true) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.transformAndCompute(queueKey, new PollClosure(id));
if (idx != null) {
@@ -146,7 +146,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
int cnt = 0;
while (true) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.transformAndCompute(queueKey, new AddClosure(id, items.size()));
if (idx != null) {
@@ -199,7 +199,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
int cnt = 0;
while (true) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.transformAndCompute(queueKey, new RemoveClosure(id, rmvIdx));
if (idx != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 248b4a0..bc8688c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -728,11 +728,11 @@ public class GridDistributedTxRemoteAdapter<K, V> extends GridCacheTxAdapter<K,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
try {
commit();
- return new GridFinishedFutureEx<GridCacheTx>(this);
+ return new GridFinishedFutureEx<IgniteTx>(this);
}
catch (IgniteCheckedException e) {
return new GridFinishedFutureEx<>(e);
@@ -759,10 +759,10 @@ public class GridDistributedTxRemoteAdapter<K, V> extends GridCacheTxAdapter<K,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> rollbackAsync() {
+ @Override public IgniteFuture<IgniteTx> rollbackAsync() {
rollback();
- return new GridFinishedFutureEx<GridCacheTx>(this);
+ return new GridFinishedFutureEx<IgniteTx>(this);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 fee6d0a..1c9d367 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
@@ -828,8 +828,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
assert t.implicit();
return t.commitAsync().chain(
- new C1<IgniteFuture<GridCacheTx>, GridNearLockResponse<K, V>>() {
- @Override public GridNearLockResponse<K, V> apply(IgniteFuture<GridCacheTx> f) {
+ new C1<IgniteFuture<IgniteTx>, GridNearLockResponse<K, V>>() {
+ @Override public GridNearLockResponse<K, V> apply(IgniteFuture<IgniteTx> f) {
try {
// Check for error.
f.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 2f1c971..33c116c 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
@@ -31,8 +31,8 @@ import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
/**
*
*/
-public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFuture<GridCacheTx>
- implements GridCacheFuture<GridCacheTx> {
+public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFuture<IgniteTx>
+ implements GridCacheFuture<IgniteTx> {
/** */
private static final long serialVersionUID = 0L;
@@ -81,7 +81,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
* @param commit Commit flag.
*/
public GridDhtTxFinishFuture(GridCacheSharedContext<K, V> cctx, GridDhtTxLocalAdapter<K, V> tx, boolean commit) {
- super(cctx.kernalContext(), F.<GridCacheTx>identityReducer(tx));
+ super(cctx.kernalContext(), F.<IgniteTx>identityReducer(tx));
assert cctx != null;
@@ -189,7 +189,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
*/
public void onResult(UUID nodeId, GridDhtTxFinishResponse<K, V> res) {
if (!isDone()) {
- for (IgniteFuture<GridCacheTx> fut : futures()) {
+ for (IgniteFuture<IgniteTx> fut : futures()) {
if (isMini(fut)) {
MiniFuture f = (MiniFuture)fut;
@@ -204,7 +204,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
}
/** {@inheritDoc} */
- @Override public boolean onDone(GridCacheTx tx, Throwable err) {
+ @Override public boolean onDone(IgniteTx tx, Throwable err) {
if (initialized() || err != null) {
if (this.tx.onePhaseCommit() && (this.tx.state() == COMMITTING))
this.tx.tmCommit();
@@ -413,7 +413,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
* Mini-future for get operations. Mini-futures are only waiting on a single
* node as opposed to multiple nodes.
*/
- private class MiniFuture extends GridFutureAdapter<GridCacheTx> {
+ private class MiniFuture extends GridFutureAdapter<IgniteTx> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 1a0d840..b3f5d38 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
@@ -439,7 +439,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
/** {@inheritDoc} */
@SuppressWarnings({"ThrowableInstanceNeverThrown"})
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
if (log.isDebugEnabled())
log.debug("Committing dht local tx: " + this);
@@ -534,7 +534,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> rollbackAsync() {
+ @Override public IgniteFuture<IgniteTx> rollbackAsync() {
GridDhtTxPrepareFuture<K, V> prepFut = this.prepFut.get();
final GridDhtTxFinishFuture<K, V> fut = new GridDhtTxFinishFuture<>(cctx, this, /*rollback*/false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 1a3aba0..5b4b637 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
@@ -33,8 +33,8 @@ import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
/**
*
*/
-public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFuture<GridCacheTx>
- implements GridCacheFuture<GridCacheTx> {
+public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFuture<IgniteTx>
+ implements GridCacheFuture<IgniteTx> {
/** */
private static final long serialVersionUID = 0L;
@@ -79,7 +79,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param commit Commit flag.
*/
public GridNearTxFinishFuture(GridCacheSharedContext<K, V> cctx, GridNearTxLocal<K, V> tx, boolean commit) {
- super(cctx.kernalContext(), F.<GridCacheTx>identityReducer(tx));
+ super(cctx.kernalContext(), F.<IgniteTx>identityReducer(tx));
assert cctx != null;
@@ -188,7 +188,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
*/
public void onResult(UUID nodeId, GridNearTxFinishResponse<K, V> res) {
if (!isDone())
- for (IgniteFuture<GridCacheTx> fut : futures()) {
+ for (IgniteFuture<IgniteTx> fut : futures()) {
if (isMini(fut)) {
MiniFuture f = (MiniFuture)fut;
@@ -202,7 +202,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
/** {@inheritDoc} */
- @Override public boolean onDone(GridCacheTx tx, Throwable err) {
+ @Override public boolean onDone(IgniteTx tx, Throwable err) {
if ((initialized() || err != null)) {
if (this.tx.onePhaseCommit() && (this.tx.state() == COMMITTING))
this.tx.tmCommit();
@@ -271,7 +271,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
// Finish local mapping only as we need send commit message to backups.
for (GridDistributedTxMapping<K, V> m : mappings.values()) {
if (m.node().isLocal()) {
- IgniteFuture<GridCacheTx> fut = cctx.tm().txHandler().finishColocatedLocal(commit, tx);
+ IgniteFuture<IgniteTx> fut = cctx.tm().txHandler().finishColocatedLocal(commit, tx);
// Add new future.
if (fut != null)
@@ -358,7 +358,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (n.isLocal()) {
req.miniId(IgniteUuid.randomUuid());
- IgniteFuture<GridCacheTx> fut = cctx.tm().txHandler().finish(n.id(), tx, req);
+ IgniteFuture<IgniteTx> fut = cctx.tm().txHandler().finish(n.id(), tx, req);
// Add new future.
if (fut != null)
@@ -403,7 +403,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* Mini-future for get operations. Mini-futures are only waiting on a single
* node as opposed to multiple nodes.
*/
- private class MiniFuture extends GridFutureAdapter<GridCacheTx> {
+ private class MiniFuture extends GridFutureAdapter<IgniteTx> {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 b178649..24c7feb 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
@@ -734,7 +734,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings({"ThrowableInstanceNeverThrown"})
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
if (log.isDebugEnabled())
log.debug("Committing near local tx: " + this);
@@ -780,7 +780,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> rollbackAsync() {
+ @Override public IgniteFuture<IgniteTx> rollbackAsync() {
if (log.isDebugEnabled())
log.debug("Rolling back near tx: " + this);
@@ -928,7 +928,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
*
* @return Commit future.
*/
- public IgniteFuture<GridCacheTx> commitAsyncLocal() {
+ public IgniteFuture<IgniteTx> commitAsyncLocal() {
if (log.isDebugEnabled())
log.debug("Committing colocated tx locally: " + this);
@@ -941,9 +941,9 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
// Do not create finish future if there are no remote nodes.
if (F.isEmpty(dhtMap) && F.isEmpty(nearMap)) {
if (prep != null)
- return (IgniteFuture<GridCacheTx>)(IgniteFuture)prep;
+ return (IgniteFuture<IgniteTx>)(IgniteFuture)prep;
- return new GridFinishedFuture<GridCacheTx>(cctx.kernalContext(), this);
+ return new GridFinishedFuture<IgniteTx>(cctx.kernalContext(), this);
}
final GridDhtTxFinishFuture<K, V> fut = new GridDhtTxFinishFuture<>(cctx, this, /*commit*/true);
@@ -1001,7 +1001,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
*
* @return Commit future.
*/
- public IgniteFuture<GridCacheTx> rollbackAsyncLocal() {
+ public IgniteFuture<IgniteTx> rollbackAsyncLocal() {
if (log.isDebugEnabled())
log.debug("Rolling back colocated tx locally: " + this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
index 6356034..c049af8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
@@ -142,7 +142,7 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings( {"unchecked", "RedundantCast"})
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
try {
prepare();
}
@@ -172,7 +172,7 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
rollbackAsync().get();
}
- @Override public IgniteFuture<GridCacheTx> rollbackAsync() {
+ @Override public IgniteFuture<IgniteTx> rollbackAsync() {
try {
state(ROLLING_BACK);
@@ -180,7 +180,7 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
state(ROLLED_BACK);
- return new GridFinishedFuture<GridCacheTx>(cctx.kernalContext(), this);
+ return new GridFinishedFuture<IgniteTx>(cctx.kernalContext(), this);
}
catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(cctx.kernalContext(), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
index 7ce1e11..084f196 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -39,7 +39,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart() throws IllegalStateException {
+ @Override public IgniteTx txStart() throws IllegalStateException {
TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();
return txStart0(
@@ -52,7 +52,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation");
@@ -68,7 +68,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize) {
A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation");
@@ -84,7 +84,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
);
}
- @Override public GridCacheTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize) {
A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation");
@@ -108,7 +108,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
* @param sys System flag.
* @return Transaction.
*/
- private GridCacheTx txStart0(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ private IgniteTx txStart0(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize, boolean sys) {
TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();
@@ -139,12 +139,12 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
assert tx != null;
// Wrap into proxy.
- return new GridCacheTxProxyImpl<>(tx, cctx);
+ return new IgniteTxProxyImpl<>(tx, cctx);
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartAffinity(String cacheName, Object affinityKey, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartAffinity(String cacheName, Object affinityKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheAdapter<Object, Object> cache = cctx.kernalContext().cache().internalCache(cacheName);
@@ -156,7 +156,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartPartition(String cacheName, int partId, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartPartition(String cacheName, int partId, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheAdapter<Object, Object> cache = cctx.kernalContext().cache().internalCache(cacheName);
@@ -185,10 +185,10 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
* @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("unchecked")
- private GridCacheTx txStartGroupLock(GridCacheContext ctx, Object grpLockKey, GridCacheTxConcurrency concurrency,
+ private IgniteTx txStartGroupLock(GridCacheContext ctx, Object grpLockKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, boolean partLock, long timeout, int txSize, boolean sys)
throws IllegalStateException, IgniteCheckedException {
- GridCacheTx tx = cctx.tm().userTx();
+ IgniteTx tx = cctx.tm().userTx();
if (tx != null)
throw new IllegalStateException("Failed to start new transaction " +
@@ -225,11 +225,11 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
// Wrap into proxy.
- return new GridCacheTxProxyImpl<>(tx0, cctx);
+ return new IgniteTxProxyImpl<>(tx0, cctx);
}
/** {@inheritDoc} */
- @Nullable @Override public GridCacheTx tx() {
+ @Nullable @Override public IgniteTx tx() {
return cctx.tm().userTx();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
index 421f24e..e07a7e5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java
@@ -264,7 +264,7 @@ public class GridDataLoadCacheUpdaters {
Integer part = e.getKey();
int cnt = e.getValue();
- GridCacheTx tx = cache.txStartPartition(part, PESSIMISTIC, REPEATABLE_READ, 0, cnt);
+ IgniteTx tx = cache.txStartPartition(part, PESSIMISTIC, REPEATABLE_READ, 0, cnt);
try {
updateAll(cache, rmvPartMap == null ? null : rmvPartMap.get(part),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
index ddbeae2..946e39e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
@@ -677,7 +677,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
// Need to check if block is partially written.
// If so, must update it in pessimistic transaction.
if (block.length != fileInfo.blockSize()) {
- try (GridCacheTx tx = dataCachePrj.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = dataCachePrj.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Map<GridGgfsBlockKey, byte[]> vals = dataCachePrj.getAll(F.asList(colocatedKey, key));
byte[] val = vals.get(colocatedKey);
@@ -1117,7 +1117,7 @@ public class GridGgfsDataManager extends GridGgfsManager {
GridGgfsBlockKey key = new GridGgfsBlockKey(colocatedKey.getFileId(), null,
colocatedKey.evictExclude(), colocatedKey.getBlockId());
- GridCacheTx tx = dataCachePrj.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = dataCachePrj.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
// Lock keys.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
index 0e2f286..da7832c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
@@ -399,7 +399,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
assert validTxState(false);
assert fileId != null;
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
// Lock file ID for this transaction.
@@ -482,7 +482,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
IgniteUuid fileId = info.id();
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
// Lock file ID for this transaction.
@@ -683,7 +683,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
IgniteUuid res = null;
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
res = putIfAbsentNonTx(parentId, fileName, newFileInfo);
@@ -772,7 +772,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
moveNonTx(fileId, srcFileName, srcParentId, destFileName, destParentId);
@@ -892,7 +892,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
if (parentId != null)
@@ -1006,7 +1006,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
if (parentId == null)
@@ -1127,7 +1127,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
assert listing != null;
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
Collection<IgniteUuid> res = new HashSet<>();
@@ -1212,7 +1212,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
boolean res = false;
@@ -1385,7 +1385,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
assert validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
GridGgfsFileInfo info = updatePropertiesNonTx(parentId, fileId, fileName, props);
@@ -1455,7 +1455,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
if (log.isDebugEnabled())
log.debug("Update file info [fileId=" + fileId + ", c=" + c + ']');
- GridCacheTx tx = metaCache.isLockedByThread(fileId) ? null : metaCache.txStart(PESSIMISTIC,
+ IgniteTx tx = metaCache.isLockedByThread(fileId) ? null : metaCache.txStart(PESSIMISTIC,
REPEATABLE_READ);
try {
@@ -1518,7 +1518,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
try {
validTxState(false);
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
Object prev = val != null ? metaCache.put(sampling, val) : metaCache.remove(sampling);
@@ -2352,7 +2352,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
pathIds.add(fileIds(path));
// Start pessimistic.
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
// Lock the very first existing parents and possibly the leaf as well.
@@ -2574,7 +2574,7 @@ public class GridGgfsMetaManager extends GridGgfsManager {
assert validTxState(false);
// Start pessimistic transaction.
- GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
Map<IgniteUuid, GridGgfsFileInfo> infoMap = lockIds(fileId, parentId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index b897b93..c05097c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -456,7 +456,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
return ctx.closure().callLocalSafe(new Callable<Object>() {
@Override public Object call() throws Exception {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Object curVal = cache.get(key);
if (curVal == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
index 39215f8..a78d063 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
@@ -620,7 +620,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
Object affKey = cfg.getAffinityKey();
while (true) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
GridServiceAssignmentsKey key = new GridServiceAssignmentsKey(cfg.getName());
GridServiceAssignments oldAssigns = (GridServiceAssignments)cache.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheBalancingStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheBalancingStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheBalancingStoreSelfTest.java
index a0eeae1..8239278 100644
--- a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheBalancingStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridCacheBalancingStoreSelfTest.java
@@ -120,7 +120,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Nullable @Override public Integer load(@Nullable GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Nullable @Override public Integer load(@Nullable IgniteTx tx, Integer key) throws IgniteCheckedException {
boolean res = locks[key].tryLock();
if (res) {
@@ -144,7 +144,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void loadAll(@Nullable GridCacheTx tx, Collection<? extends Integer> keys,
+ @Override public void loadAll(@Nullable IgniteTx tx, Collection<? extends Integer> keys,
IgniteBiInClosure<Integer, Integer> c) throws IgniteCheckedException {
for (Integer key : keys) {
boolean res = locks[key].tryLock();
@@ -163,29 +163,29 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, Integer key, Integer val) throws IgniteCheckedException {
+ @Override public void put(@Nullable IgniteTx tx, Integer key, Integer val) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void putAll(@Nullable GridCacheTx tx, Map<? extends Integer, ? extends Integer> map)
+ @Override public void putAll(@Nullable IgniteTx tx, Map<? extends Integer, ? extends Integer> map)
throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(@Nullable IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void removeAll(@Nullable GridCacheTx tx, Collection<? extends Integer> keys)
+ @Override public void removeAll(@Nullable IgniteTx tx, Collection<? extends Integer> keys)
throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
// No-op.
}
}