Repository: ignite Updated Branches: refs/heads/ignite-1537 b7202b2be -> f6195b432
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6195b43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6195b43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6195b43 Branch: refs/heads/ignite-1537 Commit: f6195b432b19cedfedfc905dd87ba2e308b3215f Parents: b7202b2 Author: sboikov <[email protected]> Authored: Mon Jan 11 14:45:21 2016 +0300 Committer: sboikov <[email protected]> Committed: Mon Jan 11 14:45:21 2016 +0300 ---------------------------------------------------------------------- .../cache/CacheEntrySerializablePredicate.java | 3 ++- .../cache/CacheInvokeDirectResult.java | 4 ++-- .../processors/cache/GridCacheReturn.java | 2 ++ .../GridDistributedLockResponse.java | 2 +- .../GridDistributedTxPrepareRequest.java | 2 +- .../GridDistributedTxPrepareResponse.java | 4 ++-- .../dht/GridDhtAffinityAssignmentResponse.java | 4 ++-- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtTxFinishResponse.java | 4 ++-- .../dht/GridDhtTxPrepareRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 ++++++++++++------- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 ++++-- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +++++++++++++------- .../atomic/GridNearAtomicUpdateResponse.java | 4 ++-- .../dht/preloader/GridDhtForceKeysResponse.java | 6 ++++-- .../GridDhtPartitionDemandMessage.java | 6 ++++-- .../GridDhtPartitionSupplyMessageV2.java | 6 +++++- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 ++-- .../distributed/near/GridNearGetResponse.java | 4 ++-- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishRequest.java | 5 +++++ .../near/GridNearTxFinishResponse.java | 4 ++-- .../near/GridNearTxPrepareResponse.java | 4 ++-- .../cache/query/GridCacheQueryRequest.java | 16 +++++++------- .../cache/query/GridCacheQueryResponse.java | 18 ++++++++++------ .../cache/transactions/IgniteTxEntry.java | 11 +++++++--- .../datastreamer/DataStreamerRequest.java | 1 + .../processors/igfs/IgfsAckMessage.java | 4 ++-- 29 files changed, 108 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java index a243c4e..20cc005 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java @@ -86,7 +86,8 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { p.prepareMarshal(ctx); - bytes = ctx.marshaller().marshal(p); + if (bytes == null) + bytes = ctx.marshaller().marshal(p); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index bee1427..fefa422 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -104,7 +104,7 @@ public class CacheInvokeDirectResult implements Message { public void prepareMarshal(GridCacheContext ctx) throws IgniteCheckedException { key.prepareMarshal(ctx.cacheObjectContext()); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); if (res != null) @@ -119,7 +119,7 @@ public class CacheInvokeDirectResult implements Message { public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws IgniteCheckedException { key.finishUnmarshal(ctx.cacheObjectContext(), ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); if (res != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java index 21154c9..a9edb95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java @@ -169,6 +169,7 @@ public class GridCacheReturn implements Externalizable, Message { * @param cctx Cache context. * @param cacheObj Value to set. * @param success Success flag to set. + * @param keepBinary Keep binary flag. * @return This instance for chaining. */ public GridCacheReturn set( @@ -187,6 +188,7 @@ public class GridCacheReturn implements Externalizable, Message { /** * @param cctx Cache context. * @param cacheObj Cache object. + * @param keepBinary Keep binary flag. */ private void initValue(GridCacheContext cctx, @Nullable CacheObject cacheObj, boolean keepBinary) { if (loc) http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index bb3f9ff..f088e1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -194,7 +194,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { prepareMarshalCacheObjects(vals, ctx.cacheContext(cacheId)); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 e595942..0d26c84 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 @@ -317,7 +317,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage if (reads != null) marshalTx(reads, ctx); - if (dhtVers != null) { + if (dhtVers != null && dhtVerKeys == null) { for (IgniteTxKey key : dhtVers.keySet()) { GridCacheContext cctx = ctx.cacheContext(key.cacheId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index d2c5aa4..4d22213 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -93,7 +93,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); } @@ -101,7 +101,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index e731406..8e041c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -104,7 +104,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (affAssignment != null) + if (affAssignment != null && affAssignmentBytes == null) affAssignmentBytes = ctx.marshaller().marshal(affAssignment); } @@ -113,7 +113,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (affAssignmentBytes != null) { + if (affAssignmentBytes != null && affAssignment == null) { affAssignment = ctx.marshaller().unmarshal(affAssignmentBytes, ldr); // TODO IGNITE-2110: setting 'local' for nodes not needed when IGNITE-2110 is implemented. http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 62cf69d..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 @@ -311,7 +311,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { prepareMarshalCacheObjects(nearKeys, ctx.cacheContext(cacheId)); - if (owned != null) { + if (owned != null && ownedKeys == null) { ownedKeys = new KeyCacheObject[owned.size()]; ownedValues = new GridCacheVersion[ownedKeys.length]; http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 fb4d97d..626ad89 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 @@ -109,7 +109,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (checkCommittedErr != null) + if (checkCommittedErr != null && checkCommittedErrBytes == null) checkCommittedErrBytes = ctx.marshaller().marshal(checkCommittedErr); } @@ -118,7 +118,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (checkCommittedErrBytes != null) + if (checkCommittedErrBytes != null && checkCommittedErr == null) checkCommittedErr = ctx.marshaller().unmarshal(checkCommittedErrBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 394ff89..d31ecba 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 @@ -281,7 +281,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (owned != null) { + if (owned != null && ownedKeys == null) { ownedKeys = owned.keySet(); ownedVals = owned.values(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 7bee5a3..7cc276f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -656,11 +656,14 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid if (!addDepInfo && ctx.deploymentEnabled()) addDepInfo = true; - invokeArgsBytes = marshalInvokeArguments(invokeArgs, cctx); + if (invokeArgsBytes == null) + invokeArgsBytes = marshalInvokeArguments(invokeArgs, cctx); - entryProcessorsBytes = marshalCollection(entryProcessors, cctx); + if (entryProcessorsBytes == null) + entryProcessorsBytes = marshalCollection(entryProcessors, cctx); - nearEntryProcessorsBytes = marshalCollection(nearEntryProcessors, cctx); + if (nearEntryProcessorsBytes == null) + nearEntryProcessorsBytes = marshalCollection(nearEntryProcessors, cctx); } } @@ -681,13 +684,15 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid finishUnmarshalCacheObjects(prevVals, cctx, ldr); if (forceTransformBackups) { - entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr); + if (entryProcessors == null) + entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr); - invokeArgs = unmarshalInvokeArguments(invokeArgsBytes, ctx, ldr); - } + if (invokeArgs == null) + invokeArgs = unmarshalInvokeArguments(invokeArgsBytes, ctx, ldr); - if (forceTransformBackups) - nearEntryProcessors = unmarshalCollection(nearEntryProcessorsBytes, ctx, ldr); + if (nearEntryProcessors == null) + nearEntryProcessors = unmarshalCollection(nearEntryProcessorsBytes, ctx, ldr); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index f1bb323..95fdeb6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -165,7 +165,8 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri prepareMarshalCacheObjects(nearEvicted, cctx); - errBytes = ctx.marshaller().marshal(err); + if (err != null && errBytes == null) + errBytes = ctx.marshaller().marshal(err); } /** {@inheritDoc} */ @@ -178,7 +179,8 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri finishUnmarshalCacheObjects(nearEvicted, cctx, ldr); - err = ctx.marshaller().unmarshal(errBytes, ldr); + if (errBytes != null && err == null) + err = ctx.marshaller().unmarshal(errBytes, ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 7c0aba5..9c4b486 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -184,6 +184,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri * @param subjId Subject ID. * @param taskNameHash Task name hash code. * @param skipStore Skip write-through to a persistent storage. + * @param keepBinary Keep binary flag. * @param clientReq Client node request flag. * @param addDepInfo Deployment info flag. */ @@ -593,7 +594,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri filter = null; } - if (expiryPlc != null) + if (expiryPlc != null && expiryPlcBytes == null) expiryPlcBytes = CU.marshal(cctx, new IgniteExternalizableExpiryPolicy(expiryPlc)); if (op == TRANSFORM) { @@ -601,9 +602,11 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri if (!addDepInfo && ctx.deploymentEnabled()) addDepInfo = true; - entryProcessorsBytes = marshalCollection(entryProcessors, cctx); + if (entryProcessorsBytes == null) + entryProcessorsBytes = marshalCollection(entryProcessors, cctx); - invokeArgsBytes = marshalInvokeArguments(invokeArgs, cctx); + if (invokeArgsBytes == null) + invokeArgsBytes = marshalInvokeArguments(invokeArgs, cctx); } else prepareMarshalCacheObjects(vals, cctx); @@ -617,8 +620,13 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri finishUnmarshalCacheObjects(keys, cctx, ldr); - if (op == TRANSFORM) - entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr); + if (op == TRANSFORM) { + if (entryProcessors == null) + entryProcessors = unmarshalCollection(entryProcessorsBytes, ctx, ldr); + + if (invokeArgs == null) + invokeArgs = unmarshalInvokeArguments(invokeArgsBytes, ctx, ldr); + } else finishUnmarshalCacheObjects(vals, cctx, ldr); @@ -629,9 +637,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri } } - invokeArgs = unmarshalInvokeArguments(invokeArgsBytes, ctx, ldr); - - if (expiryPlcBytes != null) + if (expiryPlcBytes != null && expiryPlc == null) expiryPlc = ctx.marshaller().unmarshal(expiryPlcBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index b164e7e..3e3ac29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -394,7 +394,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); GridCacheContext cctx = ctx.cacheContext(cacheId); @@ -413,7 +413,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); GridCacheContext cctx = ctx.cacheContext(cacheId); http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 4cdecec..9c5238a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -170,7 +170,8 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa info.marshal(cctx); } - errBytes = ctx.marshaller().marshal(err); + if (err != null && errBytes == null) + errBytes = ctx.marshaller().marshal(err); } /** {@inheritDoc} */ @@ -187,7 +188,8 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa info.unmarshal(cctx, ldr); } - err = ctx.marshaller().unmarshal(errBytes, ldr); + if (errBytes != null && err == null) + err = ctx.marshaller().unmarshal(errBytes, ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index 53c3d90..5cb84dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -66,6 +66,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { /** * @param updateSeq Update sequence for this node. * @param topVer Topology version. + * @param cacheId Cache ID. */ GridDhtPartitionDemandMessage(long updateSeq, @NotNull AffinityTopologyVersion topVer, int cacheId) { this.cacheId = cacheId; @@ -75,6 +76,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { /** * @param cp Message to copy from. + * @param parts Partitions. */ GridDhtPartitionDemandMessage(GridDhtPartitionDemandMessage cp, Collection<Integer> parts) { cacheId = cp.cacheId; @@ -181,7 +183,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (topic != null) + if (topic != null && topicBytes == null) topicBytes = ctx.marshaller().marshal(topic); } @@ -189,7 +191,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (topicBytes != null) + if (topicBytes != null && topic == null) topic = ctx.marshaller().unmarshal(topicBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java index 41454f9..4451cbc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java @@ -75,9 +75,13 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements /** * @param updateSeq Update sequence for this node. * @param cacheId Cache ID. + * @param topVer Topology version. * @param addDepInfo Deployment info flag. */ - GridDhtPartitionSupplyMessageV2(long updateSeq, int cacheId, AffinityTopologyVersion topVer, boolean addDepInfo) { + GridDhtPartitionSupplyMessageV2(long updateSeq, + int cacheId, + AffinityTopologyVersion topVer, + boolean addDepInfo) { this.cacheId = cacheId; this.updateSeq = updateSeq; this.topVer = topVer; http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 0cbdc91..6afb9b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -134,7 +134,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa if (parts != null && partsBytes == null) partsBytes = ctx.marshaller().marshal(parts); - if (partCntrs != null) + if (partCntrs != null && partCntrsBytes == null) partCntrsBytes = ctx.marshaller().marshal(partCntrs); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index c07a508..1185913 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -138,7 +138,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes if (partsBytes == null && parts != null) partsBytes = ctx.marshaller().marshal(parts); - if (partCntrs != null) + if (partCntrsBytes == null && partCntrs != null) partCntrsBytes = ctx.marshaller().marshal(partCntrs); } @@ -149,7 +149,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes if (partsBytes != null && parts == null) parts = ctx.marshaller().unmarshal(partsBytes, ldr); - if (partCntrsBytes != null) + if (partCntrsBytes != null && partCntrs == null) partCntrs = ctx.marshaller().unmarshal(partCntrsBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 15a791f..6ac91cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@ -188,7 +188,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe info.marshal(cctx); } - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); } @@ -203,7 +203,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe info.unmarshal(cctx, ldr); } - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 42ad7ed..314c35c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -167,7 +167,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC ((GridCacheEntryInfo)res).marshal(cctx); } - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 3e5e28f..65eac63 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 @@ -70,6 +70,9 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { * @param commit Commit flag. * @param invalidate Invalidate flag. * @param sys System flag. + * @param plc IO policy. + * @param syncCommit Sync commit flag. + * @param syncRollback Sync rollback flag. * @param explicitLock Explicit lock flag. * @param storeEnabled Store enabled flag. * @param topVer Topology version. @@ -77,6 +80,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { * @param committedVers Committed versions. * @param rolledbackVers Rolled back versions. * @param txSize Expected transaction size. + * @param subjId Subject ID. + * @param taskNameHash Task name hash. * @param addDepInfo Deployment info flag. */ public GridNearTxFinishRequest( http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index 4904ad8..b84d2fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -99,7 +99,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); } @@ -107,7 +107,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/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 d886243..8812709 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 @@ -264,7 +264,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (ownedVals != null) { + if (ownedVals != null && ownedValKeys == null) { ownedValKeys = ownedVals.keySet(); ownedValVals = ownedVals.values(); @@ -287,7 +287,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse } if (filterFailedKeys != null) { - for (IgniteTxKey key :filterFailedKeys) { + for (IgniteTxKey key : filterFailedKeys) { GridCacheContext cctx = ctx.cacheContext(key.cacheId()); key.prepareMarshal(cctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index 59d8b5b..dc98eda 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -280,28 +280,28 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache GridCacheContext cctx = ctx.cacheContext(cacheId); - if (keyValFilter != null) { + if (keyValFilter != null && keyValFilterBytes == null) { if (addDepInfo) prepareObject(keyValFilter, cctx); keyValFilterBytes = CU.marshal(cctx, keyValFilter); } - if (rdc != null) { + if (rdc != null && rdcBytes == null) { if (addDepInfo) prepareObject(rdc, cctx); rdcBytes = CU.marshal(cctx, rdc); } - if (trans != null) { + if (trans != null && transBytes == null) { if (addDepInfo) prepareObject(trans, cctx); transBytes = CU.marshal(cctx, trans); } - if (!F.isEmpty(args)) { + if (!F.isEmpty(args) && argsBytes == null) { if (addDepInfo) { for (Object arg : args) prepareObject(arg, cctx); @@ -317,16 +317,16 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache Marshaller mrsh = ctx.marshaller(); - if (keyValFilterBytes != null) + if (keyValFilterBytes != null && keyValFilter == null) keyValFilter = mrsh.unmarshal(keyValFilterBytes, ldr); - if (rdcBytes != null) + if (rdcBytes != null && rdc == null) rdc = mrsh.unmarshal(rdcBytes, ldr); - if (transBytes != null) + if (transBytes != null && trans == null) trans = mrsh.unmarshal(transBytes, ldr); - if (argsBytes != null) + if (argsBytes != null && args == null) args = mrsh.unmarshal(argsBytes, ldr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java index cce465b..ab882d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java @@ -122,11 +122,14 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach GridCacheContext cctx = ctx.cacheContext(cacheId); - if (err != null) + if (err != null && errBytes == null) errBytes = ctx.marshaller().marshal(err); - metaDataBytes = marshalCollection(metadata, cctx); - dataBytes = marshalCollection(data, cctx); + if (metaDataBytes == null) + metaDataBytes = marshalCollection(metadata, cctx); + + if (dataBytes == null) + dataBytes = marshalCollection(data, cctx); if (addDepInfo && !F.isEmpty(data)) { for (Object o : data) { @@ -144,11 +147,14 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = ctx.marshaller().unmarshal(errBytes, ldr); - metadata = unmarshalCollection(metaDataBytes, ctx, ldr); - data = unmarshalCollection(dataBytes, ctx, ldr); + if (metadata == null) + metadata = unmarshalCollection(metaDataBytes, ctx, ldr); + + if (data == null) + data = unmarshalCollection(dataBytes, ctx, ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index c42bc7f..f731975 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -828,7 +828,12 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { val.marshal(ctx, context()); - expiryPlcBytes = transferExpiryPlc ? CU.marshal(this.ctx, new IgniteExternalizableExpiryPolicy(expiryPlc)) : null; + if (transferExpiryPlc) { + if (expiryPlcBytes == null) + expiryPlcBytes = CU.marshal(this.ctx, new IgniteExternalizableExpiryPolicy(expiryPlc)); + } + else + expiryPlcBytes = null; } /** @@ -871,8 +876,8 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { val.unmarshal(this.ctx, clsLdr); - if (expiryPlcBytes != null) - expiryPlc = ctx.marshaller().unmarshal(expiryPlcBytes, clsLdr); + if (expiryPlcBytes != null && expiryPlc == null) + expiryPlc = ctx.marshaller().unmarshal(expiryPlcBytes, clsLdr); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java index 3d65304..77c802d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java @@ -105,6 +105,7 @@ public class DataStreamerRequest implements Message { * @param entries Entries to put. * @param ignoreDepOwnership Ignore ownership. * @param skipStore Skip store flag. + * @param keepBinary Keep binary flag. * @param depMode Deployment mode. * @param sampleClsName Sample class name. * @param userVer User version. http://git-wip-us.apache.org/repos/asf/ignite/blob/f6195b43/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java index f4a8fad..ecb892e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java @@ -90,7 +90,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException { super.prepareMarshal(marsh); - if (err != null) + if (err != null && errBytes == null) errBytes = marsh.marshal(err); } @@ -98,7 +98,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { @Override public void finishUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(marsh, ldr); - if (errBytes != null) + if (errBytes != null && err == null) err = marsh.unmarshal(errBytes, ldr); }
