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 2017/03/24 14:12:40 UTC
[50/50] [abbrv] ignite git commit: IGNITE-3477 - Fixing tests
IGNITE-3477 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9129b742
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9129b742
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9129b742
Branch: refs/heads/ignite-3477-master
Commit: 9129b7428bd7f2ea02f294b7d5bed4f021f00c3d
Parents: 81ae2d8
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Mar 24 17:11:02 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Mar 24 17:11:02 2017 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedLockRequest.java | 18 ++++-----
.../GridDistributedUnlockRequest.java | 2 +-
.../distributed/dht/GridDhtLockRequest.java | 41 ++++++++++----------
.../distributed/dht/GridDhtUnlockRequest.java | 5 ++-
.../dht/atomic/GridDhtAtomicNearResponse.java | 2 +-
.../GridNearAtomicCheckUpdateRequest.java | 2 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 2 +
.../dht/atomic/NearCacheUpdates.java | 2 +-
.../distributed/dht/atomic/UpdateErrors.java | 2 +-
.../distributed/near/GridNearGetRequest.java | 6 +--
.../distributed/near/GridNearLockRequest.java | 36 ++++++++---------
.../cache/distributed/near/GridNearTxLocal.java | 12 +++---
.../cache/transactions/IgniteTxHandler.java | 14 +++----
.../processors/cache/transactions/TxLock.java | 2 +
.../MissingMappingRequestMessage.java | 4 ++
.../MissingMappingResponseMessage.java | 15 ++++---
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
17 files changed, 89 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index bf0cfdc..48c01f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -400,25 +400,25 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeBooleanArray("retVals", retVals))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 19:
+ case 18:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 20:
+ case 19:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -516,7 +516,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
- case 17:
+ case 16:
retVals = reader.readBooleanArray("retVals");
if (!reader.isLastRead())
@@ -524,7 +524,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
- case 18:
+ case 17:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -532,7 +532,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
- case 19:
+ case 18:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -540,7 +540,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
- case 20:
+ case 19:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -560,7 +560,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 21;
+ return 20;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 7ade2a1..be7ecf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -164,7 +164,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 8;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 5f9a4da..50167d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -359,61 +359,61 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 27:
+ case 26:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
- case 28:
+ case 27:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 29:
+ case 28:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 30:
+ case 29:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -435,7 +435,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -443,7 +443,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 22:
+ case 21:
invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
@@ -451,7 +451,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 23:
+ case 22:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -459,7 +459,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 23:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -467,7 +467,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 24:
ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class);
if (!reader.isLastRead())
@@ -475,7 +475,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 25:
ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -483,7 +483,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 26:
preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
@@ -491,7 +491,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 27:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -499,7 +499,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 29:
+ case 28:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -507,13 +507,14 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 30:
+ case 29:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridDhtLockRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index ee5586e..752df54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -113,7 +113,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
}
switch (writer.state()) {
- case 9:
+ case 8:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
@@ -135,13 +135,14 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
return false;
switch (reader.state()) {
- case 9:
+ case 8:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridDhtUnlockRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 08a7e28..5dd2c03 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -166,7 +166,7 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
/** {@inheritDoc} */
@Override public byte directType() {
- return -45;
+ return -48;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
index 4d0726a..c23ebec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
@@ -96,7 +96,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheMessage {
/** {@inheritDoc} */
@Override public byte directType() {
- return -47;
+ return -50;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 4a94c22..7f56580 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -500,6 +500,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
return false;
writer.incrementState();
+
}
return true;
@@ -587,6 +588,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridNearAtomicFullUpdateRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
index a340a62..94d53e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
@@ -315,7 +315,7 @@ public class NearCacheUpdates implements Message {
/** {@inheritDoc} */
@Override public byte directType() {
- return -48;
+ return -51;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
index 1d415c8..5822374 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
@@ -202,7 +202,7 @@ public class UpdateErrors implements Message {
/** {@inheritDoc} */
@Override public byte directType() {
- return -46;
+ return -49;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 6aa7441..446e8bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -408,7 +408,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeMessage("ver", ver))
return false;
@@ -534,7 +534,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 17:
+ case 16:
ver = reader.readMessage("ver");
if (!reader.isLastRead())
@@ -554,7 +554,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 18;
+ return 17;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index e519707..48b508b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -352,55 +352,55 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeLong("createTtl", createTtl))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 27:
+ case 26:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 28:
+ case 27:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 29:
+ case 28:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -422,7 +422,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -430,7 +430,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 22:
+ case 21:
createTtl = reader.readLong("createTtl");
if (!reader.isLastRead())
@@ -438,7 +438,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 23:
+ case 22:
dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -446,7 +446,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 23:
filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
@@ -454,7 +454,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 24:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -462,7 +462,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 25:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -470,7 +470,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 26:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -478,7 +478,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 27:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -486,7 +486,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 29:
+ case 28:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index fe8d654..3f63074 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1181,9 +1181,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
old = entry.innerGet(
null,
this,
+ /*read through*/false,
/*metrics*/retval,
/*events*/retval,
- /*temporary*/false,
CU.subjectId(this, cctx),
entryProcessor,
resolveTaskName(),
@@ -1267,9 +1267,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
skipStore,
keepBinary);
- if (!implicit() && readCommitted())
- cacheCtx.evicts().touch(entry, topologyVersion());
-
if (enlisted != null)
enlisted.add(cacheKey);
@@ -1570,6 +1567,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
{
if (log.isDebugEnabled())
log.debug("Acquired transaction lock for remove on keys: " + enlisted);
+ U.debug(log, "Acquired transaction lock for remove on keys: " + enlisted);
postLockWrite(cacheCtx,
enlisted,
@@ -1778,13 +1776,13 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
readVer = getRes.version();
}
}
- else{
+ else {
val = cached.innerGet(
null,
GridNearTxLocal.this,
+ /*read through*/false,
/*metrics*/true,
/*events*/!skipVals,
- /*temporary*/false,
CU.subjectId(GridNearTxLocal.this, cctx),
transformClo,
resolveTaskName(),
@@ -2075,9 +2073,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
val = txEntry.cached().innerGet(
null,
this,
+ /*read-through*/false,
/*metrics*/true,
/*event*/!skipVals,
- /*temporary*/false,
CU.subjectId(this, cctx),
transformClo,
resolveTaskName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index dad7bfc..a34c5d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1522,16 +1522,16 @@ public class IgniteTxHandler {
}
CacheObject val = cached.innerGet(
- /*ver*/null,
+ /*ver*/null,
tx,
- /*readThrough*/false,
- /*updateMetrics*/false,
- /*evt*/false,
+ /*readThrough*/false,
+ /*updateMetrics*/false,
+ /*evt*/false,
tx.subjectId(),
- /*transformClo*/null,
+ /*transformClo*/null,
tx.resolveTaskName(),
- /*expiryPlc*/null,
- /*keepBinary*/true);
+ /*expiryPlc*/null,
+ /*keepBinary*/true);
if (val == null)
val = cacheCtx.toCacheObject(cacheCtx.store().load(null, entry.key()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
index af85735..f5fa0e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
@@ -159,6 +159,7 @@ public class TxLock implements Message {
return false;
writer.incrementState();
+
}
return true;
@@ -203,6 +204,7 @@ public class TxLock implements Message {
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(TxLock.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
index a42072a..11cfdbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
@@ -83,6 +83,7 @@ public class MissingMappingRequestMessage implements Message {
return false;
writer.incrementState();
+
}
return true;
@@ -109,6 +110,9 @@ public class MissingMappingRequestMessage implements Message {
if (!reader.isLastRead())
return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(MissingMappingRequestMessage.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
index 33f892b..3253fcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
@@ -70,21 +70,23 @@ public class MissingMappingResponseMessage implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeByte("platformId", platformId))
+ if (!writer.writeString("clsName", clsName))
return false;
writer.incrementState();
+
case 1:
- if (!writer.writeInt("typeId", typeId))
+ if (!writer.writeByte("platformId", platformId))
return false;
writer.incrementState();
case 2:
- if (!writer.writeString("clsName", clsName))
+ if (!writer.writeInt("typeId", typeId))
return false;
writer.incrementState();
+
}
return true;
@@ -99,7 +101,7 @@ public class MissingMappingResponseMessage implements Message {
switch (reader.state()) {
case 0:
- platformId = reader.readByte("platformId");
+ clsName = reader.readString("clsName");
if (!reader.isLastRead())
return false;
@@ -107,7 +109,7 @@ public class MissingMappingResponseMessage implements Message {
reader.incrementState();
case 1:
- typeId = reader.readInt("typeId");
+ platformId = reader.readByte("platformId");
if (!reader.isLastRead())
return false;
@@ -115,12 +117,13 @@ public class MissingMappingResponseMessage implements Message {
reader.incrementState();
case 2:
- clsName = reader.readString("clsName");
+ typeId = reader.readInt("typeId");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(MissingMappingResponseMessage.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9129b742/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 4ffe7e6..08dc56a 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
@@ -4180,7 +4180,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
CU.inTx(ignite(0), jcache(), concurrency, isolation, new CIX1<IgniteCache<String, Integer>>() {
@Override public void applyx(IgniteCache<String, Integer> cache) {
for (int i = 0; i < cnt; i++)
- assertTrue(cache.remove("key" + i));
+ assertTrue("Failed to remove key: key" + i, cache.remove("key" + i));
}
});