Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3dd9a3ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3dd9a3ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3dd9a3ae Branch: refs/heads/ignite-5797 Commit: 3dd9a3ae4ff8f9c646893f437eafda3e52914ebd Parents: ec2526f Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Thu Oct 4 16:22:09 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Oct 4 16:22:09 2018 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxFinishRequest.java | 14 -------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../distributed/dht/GridDhtTxPrepareRequest.java | 14 -------------- .../near/GridNearOptimisticTxPrepareFuture.java | 2 +- .../near/GridNearPessimisticTxPrepareFuture.java | 2 +- .../distributed/near/GridNearTxFinishRequest.java | 14 -------------- .../distributed/near/GridNearTxPrepareResponse.java | 14 -------------- .../cache/transactions/IgniteTxHandler.java | 3 ++- 8 files changed, 5 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/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 96cf37c..c305f97 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 @@ -436,12 +436,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); - case 27: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) - return false; - - writer.incrementState(); - case 28: if (!writer.writeCollection("updCntrs", updCntrs, MessageCollectionItemType.MSG)) return false; @@ -516,14 +510,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 27: - mvccSnapshot = reader.readMessage("mvccSnapshot"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 28: updCntrs = reader.readCollection("updCntrs", MessageCollectionItemType.MSG); http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 185093d..887c76b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -41,6 +41,7 @@ import org.apache.ignite.internal.IgniteDiagnosticPrepareContext; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheInvokeEntry; import org.apache.ignite.internal.processors.cache.CacheLockCandidates; import org.apache.ignite.internal.processors.cache.CacheObject; http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/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 e8d6bbd..37ba055 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 @@ -486,12 +486,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); - case 29: - if (!writer.writeBoolean("skipCompletedVers", skipCompletedVers)) - return false; - - writer.incrementState(); - case 30: if (!writer.writeUuid("subjId", subjId)) return false; @@ -610,14 +604,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 29: - skipCompletedVers = reader.readBoolean("skipCompletedVers"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 30: subjId = reader.readUuid("subjId"); http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 42ec5ca..0bd85a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -578,7 +578,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa m.clientFirst(), true, tx.activeCachesDeploymentEnabled(), - cctx.kernalContext().trace().tracingEnabled() ? new EventsTrace() : null)); + cctx.kernalContext().trace().tracingEnabled() ? new EventsTrace() : null); for (IgniteTxEntry txEntry : m.entries()) { if (txEntry.op() == TRANSFORM) http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java index 37fd8de..5a4f7cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java @@ -234,7 +234,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA false, true, tx.activeCachesDeploymentEnabled(), - cctx.kernalContext().trace().tracingEnabled() ? new EventsTrace() : null)); + cctx.kernalContext().trace().tracingEnabled() ? new EventsTrace() : null); req.queryUpdate(m.queryUpdate()); http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/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 56200eb..eb9c371 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 @@ -198,12 +198,6 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); - case 22: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) - return false; - - writer.incrementState(); - } return true; @@ -228,14 +222,6 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 22: - mvccSnapshot = reader.readMessage("mvccSnapshot"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - } return reader.afterMessageRead(GridNearTxFinishRequest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/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 2f259e2..bc6a021 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 @@ -435,12 +435,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse writer.incrementState(); case 20: - if (!writer.writeMessage("writeVer", writeVer)) - return false; - - writer.incrementState(); - - case 20: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; @@ -535,14 +529,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 20: - writeVer = reader.readMessage("writeVer"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 20: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/3dd9a3ae/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 7630136..44ce649 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 @@ -634,7 +634,8 @@ public class IgniteTxHandler { e, null, req.onePhaseCommit(), - req.deployInfo() != null); + req.deployInfo() != null, + null); try { ctx.io().send(node.id(), res, req.policy());
