IGNITE-264 - Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2182da3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2182da3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2182da3a Branch: refs/heads/ignite-264 Commit: 2182da3a42b5b01831661e4e1de9706a36118c78 Parents: 870cc58 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Feb 24 14:52:19 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Feb 24 14:52:19 2015 -0800 ---------------------------------------------------------------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 2 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../distributed/GridDistributedBaseMessage.java | 28 ------------------ .../distributed/GridDistributedLockRequest.java | 22 ++------------ .../GridDistributedTxFinishRequest.java | 20 ++----------- .../GridDistributedTxPrepareRequest.java | 30 +++----------------- .../distributed/dht/GridDhtLockRequest.java | 12 ++------ .../distributed/dht/GridDhtTxFinishRequest.java | 18 ++---------- .../dht/GridDhtTxFinishResponse.java | 2 +- .../dht/GridDhtTxPrepareRequest.java | 6 ++-- .../dht/GridDhtTxPrepareResponse.java | 2 +- .../distributed/near/GridNearLockRequest.java | 18 ++++-------- .../distributed/near/GridNearLockResponse.java | 16 ----------- .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxPrepareRequest.java | 6 ++-- .../near/GridNearTxPrepareResponse.java | 16 +---------- .../cache/IgniteOnePhaseCommitNearSelfTest.java | 3 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 +- 18 files changed, 32 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index 2074aca..a6d233b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@ -170,7 +170,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib return false; switch (reader.state()) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index 1696953..2c63a93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@ -133,7 +133,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri return false; switch (reader.state()) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 1f554de..25d3743 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -232,18 +232,6 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< writer.incrementState(); - case 5: - if (!writer.writeCollection("committedVers", committedVers, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - - case 6: - if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - case 7: if (!writer.writeMessage("ver", ver)) return false; @@ -282,22 +270,6 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< reader.incrementState(); - case 5: - committedVers = reader.readCollection("committedVers", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 6: - rolledbackVers = reader.readCollection("rolledbackVers", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 7: ver = reader.readMessage("ver"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 69f65c0..321dafd 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 @@ -344,7 +344,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage writer.incrementState(); - case 14: + case 11: if (!writer.writeCollection("keyBytes", keyBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -402,7 +402,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (reader.state()) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -410,15 +410,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage reader.incrementState(); - case 9: - grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 10: + case 7: isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) @@ -478,14 +470,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage reader.incrementState(); - case 17: - partLock = reader.readBoolean("partLock"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 18: retVals = reader.readBooleanArray("retVals"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 506d64f..0e7166a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -260,15 +260,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; switch (reader.state()) { - case 8: - baseVer = reader.readMessage("baseVer"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 9: + case 6: commit = reader.readBoolean("commit"); if (!reader.isLastRead()) @@ -292,15 +284,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes reader.incrementState(); - case 12: - grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 13: + case 9: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 90ecdef..82b99ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -421,13 +421,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe writer.incrementState(); - case 14: - if (!writer.writeBoolean("partLock", partLock)) - return false; - - writer.incrementState(); - - case 15: + case 11: if (!writer.writeCollection("readsBytes", readsBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -491,7 +485,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; switch (reader.state()) { - case 8: + case 6: byte concurrencyOrd; concurrencyOrd = reader.readByte("concurrency"); @@ -511,15 +505,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe reader.incrementState(); - case 10: - grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 11: + case 8: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -547,15 +533,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe reader.incrementState(); - case 14: - partLock = reader.readBoolean("partLock"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 15: + case 11: readsBytes = reader.readCollection("readsBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 5c289ae..de7996b 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 @@ -325,7 +325,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { writer.incrementState(); - case 25: + case 21: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -395,7 +395,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { reader.incrementState(); - case 25: + case 21: nearKeyBytes = reader.readCollection("nearKeyBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -403,14 +403,6 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { reader.incrementState(); - case 26: - ownedBytes = reader.readByteArray("ownedBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 27: preloadKeys = reader.readBitSet("preloadKeys"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 0d1739f..2cd9ead 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 @@ -236,12 +236,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); - case 22: - if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - case 19: if (!writer.writeUuid("subjId", subjId)) return false; @@ -288,7 +282,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (reader.state()) { - case 19: + case 16: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -316,15 +310,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest reader.incrementState(); - case 22: - pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 23: + case 19: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index 2ba03da..a2959e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -151,7 +151,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); case 6: miniId = reader.readIgniteUuid("miniId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 447d3fe..5783929 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 @@ -354,7 +354,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque writer.incrementState(); - case 28: + case 24: if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -412,7 +412,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; switch (reader.state()) { - case 23: + case 19: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -452,7 +452,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque reader.incrementState(); - case 28: + case 24: nearWritesBytes = reader.readCollection("nearWritesBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index b8e4ec5..2864d63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -267,7 +267,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp return false; switch (reader.state()) { - case 10: + case 9: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 a6cc18e..41061b7 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 @@ -318,13 +318,13 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> writer.incrementState(); - case 23: + case 19: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 20: if (!writer.writeObjectArray("filterBytes", filterBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -394,7 +394,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; switch (reader.state()) { - case 22: + case 18: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -402,7 +402,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> reader.incrementState(); - case 23: + case 19: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -410,7 +410,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> reader.incrementState(); - case 24: + case 20: filterBytes = reader.readObjectArray("filterBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) @@ -450,14 +450,6 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> reader.incrementState(); - case 29: - onePhaseCommit = reader.readBoolean("onePhaseCommit"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 30: subjId = reader.readUuid("subjId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index 19519dd..f620163 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@ -193,13 +193,6 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; writer.incrementState(); - - case 15: - if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - } return true; @@ -247,15 +240,6 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; reader.incrementState(); - - case 15: - pending = reader.readCollection("pending", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 9080d44..029e464 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 @@ -212,7 +212,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; switch (reader.state()) { - case 19: + case 15: explicitLock = reader.readBoolean("explicitLock"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/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 eaf02db..ac52e90 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 @@ -271,7 +271,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ writer.incrementState(); - case 26: + case 22: if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID)) return false; @@ -329,7 +329,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ return false; switch (reader.state()) { - case 23: + case 19: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -353,7 +353,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ reader.incrementState(); - case 26: + case 22: lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index dc77bd3..72f5fe6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -310,12 +310,6 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); - case 16: - if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - case 17: if (!writer.writeByteArray("retValBytes", retValBytes)) return false; @@ -338,7 +332,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes return false; switch (reader.state()) { - case 10: + case 8: dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) @@ -386,14 +380,6 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes reader.incrementState(); - case 16: - pending = reader.readCollection("pending", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 17: retValBytes = reader.readByteArray("retValBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java index d57482e..c4b9613 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.tcp.*; @@ -222,7 +221,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest { */ private static class MessageCountingCommunicationSpi extends TcpCommunicationSpi { /** {@inheritDoc} */ - @Override public void sendMessage(ClusterNode node, MessageAdapter msg) throws IgniteSpiException { + @Override public void sendMessage(ClusterNode node, Message msg) throws IgniteSpiException { if (msg instanceof GridIoMessage) { GridIoMessage ioMsg = (GridIoMessage)msg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2182da3a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java index 0b24955..7a5696e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java @@ -150,7 +150,7 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void sendMessage(ClusterNode node, MessageAdapter msg) throws IgniteSpiException { + @Override public void sendMessage(ClusterNode node, Message msg) throws IgniteSpiException { if (!bannedClasses.contains(msg.getClass())) super.sendMessage(node, msg); }
