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:18 UTC
[25/46] incubator-ignite git commit: GG-9141 - Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 579b11c..90f2b72 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
@@ -22,8 +22,8 @@ import java.io.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Cache count down latch implementation.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 8878f37..d34ad15 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
@@ -34,8 +34,8 @@ import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
import static org.gridgain.grid.cache.GridCacheFlag.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.kernal.GridClosureCallMode.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 98720b2..1d58729 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
@@ -19,8 +19,8 @@ import org.jetbrains.annotations.*;
import java.util.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* {@link GridCacheQueue} implementation using transactional cache.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 9a5fc79..778f1d6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -56,7 +56,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
GridCacheTxLocalEx<K, V> tx,
boolean isRead,
boolean retval,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean isInvalidate,
IgnitePredicate<GridCacheEntry<K, V>>[] filter
) {
@@ -87,7 +87,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
*/
protected abstract IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout,
@Nullable GridCacheTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval,
- @Nullable GridCacheTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter);
+ @Nullable IgniteTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter);
/**
* @param key Key to remove.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
index 49cd2d5..512798e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -54,7 +54,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
private boolean isRead;
/** Transaction isolation. */
- private GridCacheTxIsolation isolation;
+ private IgniteTxIsolation isolation;
/** Key bytes for keys to lock. */
@GridDirectCollection(byte[].class)
@@ -130,7 +130,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
GridCacheVersion lockVer,
boolean isInTx,
boolean isRead,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean isInvalidate,
long timeout,
int keyCnt,
@@ -230,7 +230,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
/**
* @return Transaction isolation or <tt>null</tt> if not in transaction.
*/
- public GridCacheTxIsolation isolation() {
+ public IgniteTxIsolation isolation() {
return isolation;
}
@@ -701,7 +701,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
byte isolation0 = commState.getByte();
- isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
+ isolation = IgniteTxIsolation.fromOrdinal(isolation0);
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 8f92460..eac9362 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -36,11 +36,11 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
/** Transaction concurrency. */
@GridToStringInclude
- private GridCacheTxConcurrency concurrency;
+ private IgniteTxConcurrency concurrency;
/** Transaction isolation. */
@GridToStringInclude
- private GridCacheTxIsolation isolation;
+ private IgniteTxIsolation isolation;
/** Commit version for EC transactions. */
@GridToStringInclude
@@ -208,14 +208,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
/**
* @return Concurrency.
*/
- public GridCacheTxConcurrency concurrency() {
+ public IgniteTxConcurrency concurrency() {
return concurrency;
}
/**
* @return Isolation level.
*/
- public GridCacheTxIsolation isolation() {
+ public IgniteTxIsolation isolation() {
return isolation;
}
@@ -600,7 +600,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
byte concurrency0 = commState.getByte();
- concurrency = GridCacheTxConcurrency.fromOrdinal(concurrency0);
+ concurrency = IgniteTxConcurrency.fromOrdinal(concurrency0);
commState.idx++;
@@ -638,7 +638,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
byte isolation0 = commState.getByte();
- isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
+ isolation = IgniteTxIsolation.fromOrdinal(isolation0);
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 bc8688c..88c55df 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
@@ -26,7 +26,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
@@ -90,8 +90,8 @@ public class GridDistributedTxRemoteAdapter<K, V> extends GridCacheTxAdapter<K,
GridCacheVersion xidVer,
GridCacheVersion commitVer,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
boolean invalidate,
long timeout,
int txSize,
@@ -698,7 +698,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends GridCacheTxAdapter<K,
state(PREPARED);
if (!state(COMMITTING)) {
- GridCacheTxState state = state();
+ IgniteTxState state = state();
// If other thread is doing commit, then no-op.
if (state == COMMITTING || state == COMMITTED)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b351d2..2da6589 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -302,7 +302,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
/**
* @return Transaction isolation or {@code null} if no transaction.
*/
- @Nullable private GridCacheTxIsolation isolation() {
+ @Nullable private IgniteTxIsolation isolation() {
return tx == null ? null : tx.isolation();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 340e242..e05041a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -109,7 +109,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
long topVer,
boolean isInTx,
boolean isRead,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean isInvalidate,
long timeout,
int dhtCnt,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 1c9d367..4e628ec 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
@@ -28,8 +28,8 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
@@ -545,7 +545,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
boolean isInvalidate,
boolean isRead,
boolean retval,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
return lockAllAsyncInternal(keys, timeout, txx, isInvalidate, isRead, retval, isolation, filter);
}
@@ -569,7 +569,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
boolean isInvalidate,
boolean isRead,
boolean retval,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
if (keys == null || keys.isEmpty())
return new GridDhtFinishedFuture<>(ctx.kernalContext(), true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 33c116c..5c77413 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
@@ -25,7 +25,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 865100d..bf4e90a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -35,7 +35,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
private UUID nearNodeId;
/** Transaction isolation. */
- private GridCacheTxIsolation isolation;
+ private IgniteTxIsolation isolation;
/** Near writes. */
@GridToStringInclude
@@ -113,7 +113,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
GridCacheVersion xidVer,
GridCacheVersion commitVer,
long threadId,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean commit,
boolean invalidate,
boolean sys,
@@ -188,7 +188,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
/**
* @return Transaction isolation.
*/
- public GridCacheTxIsolation isolation() {
+ public IgniteTxIsolation isolation() {
return isolation;
}
@@ -452,7 +452,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
byte isolation0 = commState.getByte();
- isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
+ isolation = IgniteTxIsolation.fromOrdinal(isolation0);
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 b3f5d38..20985b6 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
@@ -25,7 +25,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
@@ -97,8 +97,8 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
boolean implicit,
boolean implicitSingle,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
long timeout,
boolean invalidate,
boolean storeEnabled,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index f6cc67d..9c1578c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
/**
@@ -84,8 +84,8 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
boolean implicit,
boolean implicitSingle,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
long timeout,
boolean invalidate,
boolean storeEnabled,
@@ -379,7 +379,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
@Nullable public IgniteFuture<Boolean> addEntry(long msgId, GridCacheTxEntry<K, V> e) throws IgniteCheckedException {
init();
- GridCacheTxState state = state();
+ IgniteTxState state = state();
assert state == ACTIVE || (state == PREPARING && optimistic()) : "Invalid tx state for " +
"adding entry [msgId=" + msgId + ", e=" + e + ", tx=" + this + ']';
@@ -685,7 +685,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
if (commit) {
if (!state(COMMITTING)) {
- GridCacheTxState state = state();
+ IgniteTxState state = state();
if (state != COMMITTING && state != COMMITTED)
throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 6228228..2a6fd68 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
index d5c43a8..380dc42 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -80,8 +80,8 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V>
GridCacheVersion xidVer,
GridCacheVersion commitVer,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
boolean invalidate,
long timeout,
int txSize,
@@ -140,8 +140,8 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V>
GridCacheVersion xidVer,
GridCacheVersion commitVer,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
boolean invalidate,
long timeout,
int txSize,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 77796fc..e879e5f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -557,7 +557,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
boolean isInvalidate,
boolean isRead,
boolean retval,
- @Nullable GridCacheTxIsolation isolation,
+ @Nullable IgniteTxIsolation isolation,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
return new FinishedLockFuture(new UnsupportedOperationException("Locks are not supported for " +
"GridCacheAtomicityMode.ATOMIC mode (use GridCacheAtomicityMode.TRANSACTIONAL instead)"));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 6e322a7..eeadf99 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -317,7 +317,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
*/
@Override public IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout,
@Nullable GridCacheTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval,
- @Nullable GridCacheTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
+ @Nullable IgniteTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
assert tx == null || tx instanceof GridNearTxLocal;
GridNearTxLocal<K, V> txx = (GridNearTxLocal<K, V>)tx;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 4038c01..3593878 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -228,7 +228,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
/**
* @return Transaction isolation or {@code null} if no transaction.
*/
- @Nullable private GridCacheTxIsolation isolation() {
+ @Nullable private IgniteTxIsolation isolation() {
return tx == null ? null : tx.isolation();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
index 01f85ef..7b22e47 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -596,7 +596,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
boolean isInvalidate,
boolean isRead,
boolean retval,
- @Nullable GridCacheTxIsolation isolation,
+ @Nullable IgniteTxIsolation isolation,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
return dht.lockAllAsync(keys, timeout, filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index 295be87..38d27ff 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
index 42a6bb9..b185e8d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -249,7 +249,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
/**
* @return Transaction isolation or {@code null} if no transaction.
*/
- @Nullable private GridCacheTxIsolation isolation() {
+ @Nullable private IgniteTxIsolation isolation() {
return tx == null ? null : tx.isolation();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
index 578551f..5992acb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -109,7 +109,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
boolean implicitTx,
boolean implicitSingleTx,
boolean isRead,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean isInvalidate,
long timeout,
int keyCnt,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 65a30e5..196cc87 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
@@ -27,7 +27,7 @@ import java.io.*;
import java.util.*;
import static org.gridgain.grid.cache.GridCacheFlag.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
/**
* Near cache for transactional cache.
@@ -373,7 +373,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
/** {@inheritDoc} */
@Override protected IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout,
GridCacheTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval,
- GridCacheTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
+ IgniteTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
GridNearLockFuture<K, V> fut = new GridNearLockFuture<>(ctx, keys, (GridNearTxLocal<K, V>)tx, isRead,
retval, timeout, filter);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 5b4b637..949e675 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
@@ -26,7 +26,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 24c7feb..a26b5b2 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
@@ -31,7 +31,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
@@ -94,8 +94,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
boolean implicit,
boolean implicitSingle,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
long timeout,
boolean invalidate,
boolean storeEnabled,
@@ -590,7 +590,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
if (commit) {
if (!state(COMMITTING)) {
- GridCacheTxState state = state();
+ IgniteTxState state = state();
if (state != COMMITTING && state != COMMITTED)
throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 d87a50c..0724e7d 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
@@ -29,7 +29,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java
index 2e07253..99d17eb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java
@@ -82,8 +82,8 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V>
GridCacheVersion xidVer,
GridCacheVersion commitVer,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
boolean invalidate,
long timeout,
Collection<GridCacheTxEntry<K, V>> writeEntries,
@@ -139,8 +139,8 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V>
GridCacheVersion xidVer,
GridCacheVersion commitVer,
boolean sys,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
boolean invalidate,
long timeout,
int txSize,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalCache.java
index ad70c79..66fffae 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalCache.java
@@ -87,7 +87,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public IgniteFuture<Boolean> txLockAsync(Collection<? extends K> keys, long timeout,
GridCacheTxLocalEx<K, V> tx, boolean isRead,
- boolean retval, GridCacheTxIsolation isolation, boolean invalidate,
+ boolean retval, IgniteTxIsolation isolation, boolean invalidate,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
return lockAllAsync(keys, timeout, tx, filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 c049af8..8ceb402 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
@@ -21,7 +21,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
/**
* Local cache transaction.
@@ -53,8 +53,8 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
GridCacheSharedContext<K, V> ctx,
boolean implicit,
boolean implicitSingle,
- GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation,
+ IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation,
long timeout,
int txSize,
@Nullable UUID subjId,
@@ -79,7 +79,7 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
/** {@inheritDoc} */
@Override public void prepare() throws IgniteCheckedException {
if (!state(PREPARING)) {
- GridCacheTxState state = state();
+ IgniteTxState state = state();
// If other thread is doing "prepare", then no-op.
if (state == PREPARING || state == PREPARED || state == COMMITTING || state == COMMITTED)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 8a19fb9..3e6a86b 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
@@ -22,7 +22,7 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
/**
* Replicated cache transaction future.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
index a46d809..3a63fa1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -1251,7 +1251,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
GridCacheTxLocalEx<K, V> tx,
boolean isRead,
boolean retval,
- GridCacheTxIsolation isolation,
+ IgniteTxIsolation isolation,
boolean invalidate,
IgnitePredicate<GridCacheEntry<K, V>>[] filter) {
return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 084f196..7e132a4 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
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
import static org.gridgain.grid.cache.GridCacheFlag.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Grid transactions implementation.
@@ -52,7 +52,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+ @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation");
@@ -68,7 +68,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation 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 IgniteTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStartSystem(IgniteTxConcurrency concurrency, IgniteTxIsolation 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 IgniteTx txStart0(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ private IgniteTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation,
long timeout, int txSize, boolean sys) {
TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();
@@ -144,8 +144,8 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public IgniteTx txStartAffinity(String cacheName, Object affinityKey, GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+ @Override public IgniteTx txStartAffinity(String cacheName, Object affinityKey, IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheAdapter<Object, Object> cache = cctx.kernalContext().cache().internalCache(cacheName);
if (cache == null)
@@ -156,8 +156,8 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
}
/** {@inheritDoc} */
- @Override public IgniteTx txStartPartition(String cacheName, int partId, GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+ @Override public IgniteTx txStartPartition(String cacheName, int partId, IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheAdapter<Object, Object> cache = cctx.kernalContext().cache().internalCache(cacheName);
if (cache == null)
@@ -185,8 +185,8 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx {
* @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("unchecked")
- private IgniteTx txStartGroupLock(GridCacheContext ctx, Object grpLockKey, GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation, boolean partLock, long timeout, int txSize, boolean sys)
+ private IgniteTx txStartGroupLock(GridCacheContext ctx, Object grpLockKey, IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation, boolean partLock, long timeout, int txSize, boolean sys)
throws IllegalStateException, IgniteCheckedException {
IgniteTx tx = cctx.tm().userTx();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 e07a7e5..3bb95cc 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
@@ -19,8 +19,8 @@ import org.jetbrains.annotations.*;
import java.util.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Bundled factory for cache updaters.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 946e39e..a21c8fc 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
@@ -42,8 +42,8 @@ import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridTopic.*;
import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 da7832c..eb0a728 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
@@ -31,8 +31,8 @@ import java.util.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsFileInfo.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 c05097c..c8fbe15 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
@@ -33,8 +33,8 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.kernal.processors.rest.GridRestCommand.*;
import static org.gridgain.grid.kernal.processors.license.GridLicenseSubsystem.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/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 a78d063..b8b5998 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
@@ -40,8 +40,8 @@ import java.util.concurrent.*;
import static java.util.Map.*;
import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
index 1f21d68..bff97fd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -23,10 +23,10 @@ public class VisorCacheDefaultConfiguration implements Serializable {
private static final long serialVersionUID = 0L;
/** Default transaction isolation. */
- private GridCacheTxIsolation txIsolation;
+ private IgniteTxIsolation txIsolation;
/** Default transaction concurrency. */
- private GridCacheTxConcurrency txConcurrency;
+ private IgniteTxConcurrency txConcurrency;
/** TTL value. */
private long ttl;
@@ -62,28 +62,28 @@ public class VisorCacheDefaultConfiguration implements Serializable {
/**
* @return Default transaction isolation.
*/
- public GridCacheTxIsolation txIsolation() {
+ public IgniteTxIsolation txIsolation() {
return txIsolation;
}
/**
* @param txIsolation New default transaction isolation.
*/
- public void txIsolation(GridCacheTxIsolation txIsolation) {
+ public void txIsolation(IgniteTxIsolation txIsolation) {
this.txIsolation = txIsolation;
}
/**
* @return Default transaction concurrency.
*/
- public GridCacheTxConcurrency txConcurrency() {
+ public IgniteTxConcurrency txConcurrency() {
return txConcurrency;
}
/**
* @param txConcurrency New default transaction concurrency.
*/
- public void txConcurrency(GridCacheTxConcurrency txConcurrency) {
+ public void txConcurrency(IgniteTxConcurrency txConcurrency) {
this.txConcurrency = txConcurrency;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
index 152125c..0bf521f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java
@@ -21,8 +21,8 @@ import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.IgniteSystemProperties.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Checks basic node start/stop operations.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 9fd6470..e05da61 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -25,8 +25,8 @@ import java.util.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Failover tests for cache.
@@ -199,8 +199,8 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @param isolation Isolation level.
* @throws Exception If failed.
*/
- private void testTopologyChange(@Nullable GridCacheTxConcurrency concurrency,
- @Nullable GridCacheTxIsolation isolation) throws Exception {
+ private void testTopologyChange(@Nullable IgniteTxConcurrency concurrency,
+ @Nullable IgniteTxIsolation isolation) throws Exception {
boolean tx = concurrency != null && isolation != null;
if (tx)
@@ -233,8 +233,8 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @param isolation Isolation level.
* @throws Exception If failed.
*/
- private void testConstantTopologyChange(@Nullable final GridCacheTxConcurrency concurrency,
- @Nullable final GridCacheTxIsolation isolation) throws Exception {
+ private void testConstantTopologyChange(@Nullable final IgniteTxConcurrency concurrency,
+ @Nullable final IgniteTxIsolation isolation) throws Exception {
final boolean tx = concurrency != null && isolation != null;
if (tx)
@@ -312,7 +312,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @throws IgniteCheckedException If failed.
*/
private void put(GridCacheProjection<String, Integer> cache, final int cnt,
- GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
try {
info("Putting values to cache [0," + cnt + ')');
@@ -358,7 +358,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
* @throws IgniteCheckedException If failed.
*/
private void remove(GridCacheProjection<String, Integer> cache, final int cnt,
- GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
try {
info("Removing values form cache [0," + cnt + ')');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 5368195..77482d4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -30,9 +30,9 @@ import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.testframework.GridTestUtils.*;
@@ -769,7 +769,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Isolation.
* @throws Exception If failed.
*/
- private void checkTransform(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ private void checkTransform(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
GridCacheProjection<String, Integer> cache = cache();
cache.put("key2", 1);
@@ -852,7 +852,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Transaction isolation.
* @throws Exception If failed.
*/
- private void checkTransformAll(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation)
+ private void checkTransformAll(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation)
throws Exception {
GridCacheProjection<String, Integer> cache = cache();
@@ -979,7 +979,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param concurrency Concurrency.
* @throws Exception If failed.
*/
- private void checkTransformSequential0(boolean startVal, GridCacheTxConcurrency concurrency)
+ private void checkTransformSequential0(boolean startVal, IgniteTxConcurrency concurrency)
throws Exception {
GridCacheProjection<String, Integer> cache = cache();
@@ -1029,7 +1029,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param concurrency Concurrency.
* @throws Exception If failed.
*/
- private void checkTransformAfterRemove(GridCacheTxConcurrency concurrency) throws Exception {
+ private void checkTransformAfterRemove(IgniteTxConcurrency concurrency) throws Exception {
GridCacheProjection<String, Integer> cache = cache();
cache.put("key", 4);
@@ -1095,8 +1095,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Isolation.
* @throws Exception If failed.
*/
- private void checkTransformReturnValue(boolean put, GridCacheTxConcurrency concurrency,
- GridCacheTxIsolation isolation) throws Exception {
+ private void checkTransformReturnValue(boolean put, IgniteTxConcurrency concurrency,
+ IgniteTxIsolation isolation) throws Exception {
GridCacheProjection<String, Integer> cache = cache();
if (!put)
@@ -1409,7 +1409,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Tx isolation.
* @throws Exception If failed.
*/
- private void checkFilters1(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ private void checkFilters1(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
cache().putx("key1", 0);
IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null;
@@ -1448,7 +1448,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Tx isolation.
* @throws Exception If failed.
*/
- private void checkFilters2(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ private void checkFilters2(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
cache().putx("key1", 100);
IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null;
@@ -1486,7 +1486,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Tx isolation.
* @throws Exception If failed.
*/
- private void checkFilters3(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ private void checkFilters3(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
cache().putx("key1", 100);
IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null;
@@ -3893,7 +3893,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param concurrency Concurrency.
* @throws Exception If failed.
*/
- private void checkPeekTxRemove(GridCacheTxConcurrency concurrency) throws Exception {
+ private void checkPeekTxRemove(IgniteTxConcurrency concurrency) throws Exception {
if (txEnabled()) {
GridCache<String, Integer> cache = primaryCache("key");
@@ -4735,7 +4735,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @param isolation Isolation.
* @throws Exception If failed.
*/
- private void checkRemovexInTx(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
+ private void checkRemovexInTx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception {
if (txEnabled()) {
final int cnt = 10;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
index 544a1ad..0749387 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java
@@ -44,42 +44,42 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
* @throws IgniteCheckedException If failed
*/
public void testTxReadOptimisticReadCommitted() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.READ_COMMITTED);
+ checkTransactionalRead(IgniteTxConcurrency.OPTIMISTIC, IgniteTxIsolation.READ_COMMITTED);
}
/**
* @throws IgniteCheckedException If failed
*/
public void testTxReadOptimisticRepeatableRead() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.REPEATABLE_READ);
+ checkTransactionalRead(IgniteTxConcurrency.OPTIMISTIC, IgniteTxIsolation.REPEATABLE_READ);
}
/**
* @throws IgniteCheckedException If failed
*/
public void testTxReadOptimisticSerializable() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.OPTIMISTIC, GridCacheTxIsolation.SERIALIZABLE);
+ checkTransactionalRead(IgniteTxConcurrency.OPTIMISTIC, IgniteTxIsolation.SERIALIZABLE);
}
/**
* @throws IgniteCheckedException If failed
*/
public void testTxReadPessimisticReadCommitted() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.READ_COMMITTED);
+ checkTransactionalRead(IgniteTxConcurrency.PESSIMISTIC, IgniteTxIsolation.READ_COMMITTED);
}
/**
* @throws IgniteCheckedException If failed
*/
public void testTxReadPessimisticRepeatableRead() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.REPEATABLE_READ);
+ checkTransactionalRead(IgniteTxConcurrency.PESSIMISTIC, IgniteTxIsolation.REPEATABLE_READ);
}
/**
* @throws IgniteCheckedException If failed
*/
public void testTxReadPessimisticSerializable() throws IgniteCheckedException {
- checkTransactionalRead(GridCacheTxConcurrency.PESSIMISTIC, GridCacheTxIsolation.SERIALIZABLE);
+ checkTransactionalRead(IgniteTxConcurrency.PESSIMISTIC, IgniteTxIsolation.SERIALIZABLE);
}
/**
@@ -88,7 +88,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT
* @param isolation Transaction isolation.
* @throws IgniteCheckedException If failed
*/
- protected void checkTransactionalRead(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation)
+ protected void checkTransactionalRead(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation)
throws IgniteCheckedException {
GridCache<String, Integer> cache = cache(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
index b52ac94..46462d1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -25,8 +25,8 @@ import java.util.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 8d3860f..ae77ca7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -40,8 +40,8 @@ import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
index 6173193..47a67bb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
@@ -24,8 +24,8 @@ import java.util.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Test cache operations with daemon node.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
index 5b5e372..3bfb9cd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -31,8 +31,8 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.IgniteTxIsolation.REPEATABLE_READ;
import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
index efe3a80..6325d6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
@@ -19,8 +19,8 @@ import org.gridgain.testframework.*;
import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
import static org.apache.ignite.events.IgniteEventType.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index c7db6b0..738c80b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@ -24,8 +24,8 @@ import java.util.concurrent.atomic.*;
import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
/**
* Abstract class for cache tests.