You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/03/04 01:49:18 UTC
[5/6] incubator-ignite git commit: IGNITE-141 - Marshallers
refactoring
IGNITE-141 - Marshallers refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e65817d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e65817d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e65817d
Branch: refs/heads/ignite-141
Commit: 8e65817dbc89f7e30423d70a6c4c225787dfc80c
Parents: c08158d
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 3 16:49:40 2015 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 3 16:49:40 2015 -0800
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxFinishRequest.java | 38 +++++++--------
.../dht/GridDhtTxPrepareRequest.java | 50 ++++++++++----------
.../near/GridNearTxFinishRequest.java | 26 +++++-----
.../near/GridNearTxPrepareRequest.java | 42 ++++++++--------
.../cache/GridCacheAbstractFullApiSelfTest.java | 30 ++++++------
.../GridCacheExAbstractFullApiSelfTest.java | 2 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
7 files changed, 96 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 4e84426..bf1e8b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -240,55 +240,55 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
}
switch (writer.state()) {
- case 19:
+ case 20:
if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 20:
+ case 21:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeLong("topVer", topVer))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -310,7 +310,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
return false;
switch (reader.state()) {
- case 19:
+ case 20:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -322,7 +322,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 20:
+ case 21:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -330,7 +330,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 21:
+ case 22:
nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
@@ -338,7 +338,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 22:
+ case 23:
pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -346,7 +346,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 23:
+ case 24:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -354,7 +354,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 24:
+ case 25:
sysInvalidate = reader.readBoolean("sysInvalidate");
if (!reader.isLastRead())
@@ -362,7 +362,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 25:
+ case 26:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -370,7 +370,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 26:
+ case 27:
topVer = reader.readLong("topVer");
if (!reader.isLastRead())
@@ -378,7 +378,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
reader.incrementState();
- case 27:
+ case 28:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -398,6 +398,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 28;
+ return 29;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 0216774..0f3cc90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -328,73 +328,73 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
}
switch (writer.state()) {
- case 23:
+ case 24:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeBoolean("last", last))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
- case 28:
+ case 29:
if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 29:
+ case 30:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 30:
+ case 31:
if (!writer.writeByteArray("ownedBytes", ownedBytes))
return false;
writer.incrementState();
- case 31:
+ case 32:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
- case 32:
+ case 33:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 33:
+ case 34:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 34:
+ case 35:
if (!writer.writeLong("topVer", topVer))
return false;
@@ -416,7 +416,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
return false;
switch (reader.state()) {
- case 23:
+ case 24:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -424,7 +424,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 24:
+ case 25:
invalidateNearEntries = reader.readBitSet("invalidateNearEntries");
if (!reader.isLastRead())
@@ -432,7 +432,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 25:
+ case 26:
last = reader.readBoolean("last");
if (!reader.isLastRead())
@@ -440,7 +440,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 26:
+ case 27:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -448,7 +448,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 27:
+ case 28:
nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
@@ -456,7 +456,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 28:
+ case 29:
nearWritesBytes = reader.readCollection("nearWritesBytes", MessageCollectionItemType.BYTE_ARR);
if (!reader.isLastRead())
@@ -464,7 +464,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 29:
+ case 30:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -472,7 +472,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 30:
+ case 31:
ownedBytes = reader.readByteArray("ownedBytes");
if (!reader.isLastRead())
@@ -480,7 +480,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 31:
+ case 32:
preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
@@ -488,7 +488,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 32:
+ case 33:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -496,7 +496,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 33:
+ case 34:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -504,7 +504,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
reader.incrementState();
- case 34:
+ case 35:
topVer = reader.readLong("topVer");
if (!reader.isLastRead())
@@ -524,6 +524,6 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 35;
+ return 36;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 1ac8aed..9f73e3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -169,37 +169,37 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
}
switch (writer.state()) {
- case 19:
+ case 20:
if (!writer.writeBoolean("explicitLock", explicitLock))
return false;
writer.incrementState();
- case 20:
+ case 21:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeBoolean("storeEnabled", storeEnabled))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeLong("topVer", topVer))
return false;
@@ -221,7 +221,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
return false;
switch (reader.state()) {
- case 19:
+ case 20:
explicitLock = reader.readBoolean("explicitLock");
if (!reader.isLastRead())
@@ -229,7 +229,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
reader.incrementState();
- case 20:
+ case 21:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -237,7 +237,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
reader.incrementState();
- case 21:
+ case 22:
storeEnabled = reader.readBoolean("storeEnabled");
if (!reader.isLastRead())
@@ -245,7 +245,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
reader.incrementState();
- case 22:
+ case 23:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -253,7 +253,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
reader.incrementState();
- case 23:
+ case 24:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -261,7 +261,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
reader.incrementState();
- case 24:
+ case 25:
topVer = reader.readLong("topVer");
if (!reader.isLastRead())
@@ -281,7 +281,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 25;
+ return 26;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index ca82996..ff473c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -257,61 +257,61 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
}
switch (writer.state()) {
- case 23:
+ case 24:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeBoolean("implicitSingle", implicitSingle))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeBoolean("last", last))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 28:
+ case 29:
if (!writer.writeBoolean("near", near))
return false;
writer.incrementState();
- case 29:
+ case 30:
if (!writer.writeBoolean("retVal", retVal))
return false;
writer.incrementState();
- case 30:
+ case 31:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 31:
+ case 32:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 32:
+ case 33:
if (!writer.writeLong("topVer", topVer))
return false;
@@ -333,7 +333,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
return false;
switch (reader.state()) {
- case 23:
+ case 24:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -341,7 +341,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 24:
+ case 25:
implicitSingle = reader.readBoolean("implicitSingle");
if (!reader.isLastRead())
@@ -349,7 +349,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 25:
+ case 26:
last = reader.readBoolean("last");
if (!reader.isLastRead())
@@ -357,7 +357,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 26:
+ case 27:
lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID);
if (!reader.isLastRead())
@@ -365,7 +365,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 27:
+ case 28:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -373,7 +373,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 28:
+ case 29:
near = reader.readBoolean("near");
if (!reader.isLastRead())
@@ -381,7 +381,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 29:
+ case 30:
retVal = reader.readBoolean("retVal");
if (!reader.isLastRead())
@@ -389,7 +389,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 30:
+ case 31:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -397,7 +397,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 31:
+ case 32:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -405,7 +405,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
reader.incrementState();
- case 32:
+ case 33:
topVer = reader.readLong("topVer");
if (!reader.isLastRead())
@@ -425,7 +425,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 33;
+ return 34;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 43dc0ce..4515cbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2918,7 +2918,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
public void testPeekMode() throws Exception {
String key = "testPeekMode";
- GridCache<String, Integer> cache = ((IgniteKernal)primaryIgnite(key)).cache(null);
+ Ignite ignite = primaryIgnite(key);
+
+ GridCache<String, Integer> cache = ((IgniteKernal)ignite).cache(null);
cache.put(key, 1);
@@ -2942,23 +2944,23 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
}
if (txEnabled()) {
- Transaction tx = cache.txStart();
-
- cache.replace(key, 2);
+ try (Transaction tx = ignite.transactions().txStart()) {
+ cache.replace(key, 2);
- assert cache.peek(key, F.asList(GLOBAL)) == 1;
+ assert cache.peek(key, F.asList(GLOBAL)) == 1;
- if (cacheMode() == LOCAL) {
- assert cache.peek(key, F.asList(NEAR_ONLY)) == 1;
- assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1;
- }
+ if (cacheMode() == LOCAL) {
+ assert cache.peek(key, F.asList(NEAR_ONLY)) == 1;
+ assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1;
+ }
- assert cache.peek(key, F.asList(TX)) == 2;
- assert cache.peek(key, F.asList(SMART)) == 2;
- assert cache.peek(key, F.asList(SWAP)) == null;
- assert cache.peek(key, F.asList(DB)) == 1;
+ assert cache.peek(key, F.asList(TX)) == 2;
+ assert cache.peek(key, F.asList(SMART)) == 2;
+ assert cache.peek(key, F.asList(SWAP)) == null;
+ assert cache.peek(key, F.asList(DB)) == 1;
- tx.commit();
+ tx.commit();
+ }
}
else
cache.replace(key, 2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
index 51182fd..6d96eb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheExAbstractFullApiSelfTest.java
@@ -64,7 +64,7 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra
GridCache<String, Integer> cache = cache();
- try (Transaction tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (Transaction tx = transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
int key = 0;
for (int i = 0; i < 1000; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e65817d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index f297427..6e8ff1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -414,7 +414,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
}
// Ensure that next update will not pick old expire time.
- tx = inTx ? c.txStart() : null;
+ tx = inTx ? transactions().txStart() : null;
try {
c.put(key, 10);