http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 b44f821..15f42ff 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 @@ -170,37 +170,37 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { } switch (writer.state()) { - case 19: + case 18: if (!writer.writeBoolean("explicitLock", explicitLock)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeBoolean("storeEnabled", storeEnabled)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeMessage("topVer", topVer)) return false; @@ -222,7 +222,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { return false; switch (reader.state()) { - case 19: + case 18: explicitLock = reader.readBoolean("explicitLock"); if (!reader.isLastRead()) @@ -230,7 +230,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 20: + case 19: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -238,7 +238,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 21: + case 20: storeEnabled = reader.readBoolean("storeEnabled"); if (!reader.isLastRead()) @@ -246,7 +246,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 22: + case 21: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -254,7 +254,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 23: + case 22: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -262,7 +262,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 24: + case 23: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -282,7 +282,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 25; + return 24; } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 b602a7f..4cc8f91 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 @@ -284,73 +284,73 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 23: + case 22: if (!writer.writeBoolean("explicitLock", explicitLock)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeBoolean("firstClientReq", firstClientReq)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeBoolean("implicitSingle", implicitSingle)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 30: + case 29: if (!writer.writeBoolean("near", near)) return false; writer.incrementState(); - case 31: + case 30: if (!writer.writeBoolean("retVal", retVal)) return false; writer.incrementState(); - case 32: + case 31: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 33: + case 32: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 34: + case 33: if (!writer.writeMessage("topVer", topVer)) return false; @@ -372,7 +372,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 23: + case 22: explicitLock = reader.readBoolean("explicitLock"); if (!reader.isLastRead()) @@ -380,7 +380,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 24: + case 23: firstClientReq = reader.readBoolean("firstClientReq"); if (!reader.isLastRead()) @@ -388,7 +388,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: + case 24: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -396,7 +396,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 26: + case 25: implicitSingle = reader.readBoolean("implicitSingle"); if (!reader.isLastRead()) @@ -404,7 +404,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 27: + case 26: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -412,7 +412,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 28: + case 27: lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID); if (!reader.isLastRead()) @@ -420,7 +420,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 29: + case 28: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -428,7 +428,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 30: + case 29: near = reader.readBoolean("near"); if (!reader.isLastRead()) @@ -436,7 +436,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 31: + case 30: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) @@ -444,7 +444,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 32: + case 31: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -452,7 +452,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 33: + case 32: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -460,7 +460,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 34: + case 33: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -480,7 +480,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 35; + return 34; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 0f0b2c0..b418500 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 @@ -345,67 +345,67 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse } switch (writer.state()) { - case 10: + case 8: if (!writer.writeMessage("clientRemapVer", clientRemapVer)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeMessage("dhtVer", dhtVer)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 15: + case 13: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 16: + case 14: if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 17: + case 15: if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 18: + case 16: if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 19: + case 17: if (!writer.writeMessage("retVal", retVal)) return false; writer.incrementState(); - case 20: + case 18: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -427,7 +427,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse return false; switch (reader.state()) { - case 10: + case 8: clientRemapVer = reader.readMessage("clientRemapVer"); if (!reader.isLastRead()) @@ -435,7 +435,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 11: + case 9: dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) @@ -443,7 +443,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 12: + case 10: filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -451,7 +451,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 13: + case 11: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -459,7 +459,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 14: + case 12: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -467,7 +467,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 15: + case 13: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 16: + case 14: ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -483,7 +483,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 17: + case 15: ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -491,7 +491,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 18: + case 16: pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -499,7 +499,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 19: + case 17: retVal = reader.readMessage("retVal"); if (!reader.isLastRead()) @@ -507,7 +507,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); - case 20: + case 18: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -527,7 +527,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 21; + return 19; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java index 3eb5dc0..292e04d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java @@ -83,7 +83,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 8; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 e6d71aa..01662ef 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 @@ -1065,8 +1065,6 @@ public class IgniteTxHandler { if (!F.isEmpty(req.writes())) { GridDhtTxRemote tx = ctx.tm().tx(req.version()); - assert F.isEmpty(req.candidatesByKey()); - if (tx == null) { tx = new GridDhtTxRemote( ctx, @@ -1197,7 +1195,6 @@ public class IgniteTxHandler { */ @Nullable public GridNearTxRemote startNearRemoteTx(ClassLoader ldr, UUID nodeId, GridDhtTxPrepareRequest req) throws IgniteCheckedException { - assert F.isEmpty(req.candidatesByKey()); if (!F.isEmpty(req.nearWrites())) { GridNearTxRemote tx = ctx.tm().nearTx(req.version()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index 4fdc027..b210625 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -186,6 +186,7 @@ public class GridQueryNextPageResponse implements Message { return false; writer.incrementState(); + } return true;
