Cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a7f99d92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a7f99d92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a7f99d92 Branch: refs/heads/ignite-2649 Commit: a7f99d92d64b3235aedf58ab262fcfa1f633a905 Parents: 1a3b0ea Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Aug 24 16:19:40 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Aug 24 16:19:40 2016 +0300 ---------------------------------------------------------------------- .../rendezvous/RendezvousAffinityFunction.java | 4 +- .../internal/GridEventConsumeHandler.java | 4 +- .../internal/GridMessageListenHandler.java | 4 +- .../router/impl/GridTcpRouterNioParser.java | 2 +- .../checkpoint/GridCheckpointManager.java | 4 +- .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../eventstorage/GridEventStorageManager.java | 8 +- .../swapspace/GridSwapSpaceManager.java | 2 +- .../processors/affinity/GridAffinityUtils.java | 2 +- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 3 +- .../processors/cache/GridCacheUtils.java | 12 +++ .../GridDistributedLockResponse.java | 3 +- .../GridDistributedTxPrepareRequest.java | 3 +- .../GridDistributedTxPrepareResponse.java | 3 +- .../dht/GridDhtAffinityAssignmentResponse.java | 3 +- .../dht/GridDhtTxFinishResponse.java | 3 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 3 +- .../atomic/GridNearAtomicUpdateResponse.java | 3 +- .../dht/preloader/GridDhtForceKeysResponse.java | 3 +- .../GridDhtPartitionDemandMessage.java | 3 +- .../preloader/GridDhtPartitionsFullMessage.java | 5 +- .../GridDhtPartitionsSingleMessage.java | 5 +- .../distributed/near/GridNearGetResponse.java | 3 +- .../near/GridNearSingleGetResponse.java | 3 +- .../near/GridNearTxFinishResponse.java | 3 +- .../cache/query/GridCacheQueryResponse.java | 3 +- .../continuous/CacheContinuousQueryHandler.java | 2 +- .../closure/GridClosureProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 2 +- .../datastreamer/DataStreamProcessor.java | 4 +- .../datastreamer/DataStreamerImpl.java | 4 +- .../processors/igfs/IgfsAckMessage.java | 2 +- .../processors/igfs/IgfsDeleteMessage.java | 3 +- .../internal/processors/igfs/IgfsPaths.java | 2 +- .../processors/job/GridJobProcessor.java | 10 +-- .../internal/processors/job/GridJobWorker.java | 6 +- .../offheap/GridOffHeapProcessor.java | 2 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../rest/protocols/tcp/GridTcpRestParser.java | 8 +- .../service/GridServiceProcessor.java | 8 +- .../processors/task/GridTaskProcessor.java | 4 +- .../processors/task/GridTaskWorker.java | 8 +- .../ignite/marshaller/MarshallerUtils.java | 91 ++++++++------------ .../spi/checkpoint/sharedfs/SharedFsUtils.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 10 +-- .../ignite/spi/discovery/tcp/ServerImpl.java | 28 +++--- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 14 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- 52 files changed, 173 insertions(+), 158 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java index 6c1fec3..1b90581 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java @@ -337,8 +337,8 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza try { ByteArrayOutputStream out = new ByteArrayOutputStream(); - byte[] nodeHashBytes = MarshallerUtils.marshal( - ignite.name(), ignite.configuration().getMarshaller(), nodeHash); + byte[] nodeHashBytes = + MarshallerUtils.marshal(ignite.name(), ignite.configuration().getMarshaller(), nodeHash); out.write(U.intToBytes(part), 0, 4); // Avoid IOException. out.write(nodeHashBytes, 0, nodeHashBytes.length); // Avoid IOException. http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java index a180965..5cb3f6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java @@ -370,7 +370,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { depInfo = new GridDeploymentInfoBean(dep); - filterBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), filter); + filterBytes = MarshallerUtils.marshal(ctx, filter); } } @@ -491,7 +491,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { void p2pMarshal(final GridKernalContext ctx) throws IgniteCheckedException { assert ctx.config().getMarshaller() != null; - bytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), evt); + bytes = MarshallerUtils.marshal(ctx, evt); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java index 373244f..1d2dda9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java @@ -160,9 +160,9 @@ public class GridMessageListenHandler implements GridContinuousHandler { assert ctx.config().isPeerClassLoadingEnabled(); if (topic != null) - topicBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), topic); + topicBytes = MarshallerUtils.marshal(ctx, topic); - predBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), pred); + predBytes = MarshallerUtils.marshal(ctx, pred); // Deploy only listener, as it is very likely to be of some user class. GridPeerDeployAware pda = U.peerDeployAware(pred); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java index 0b3a042..a4893aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java @@ -86,7 +86,7 @@ class GridTcpRouterNioParser extends GridTcpRestParser { GridClientMessage clientMsg = (GridClientMessage)msg; - ByteBuffer res = MarshallerUtils.marshal(marsh, msg, 45, ses.gridName()); + ByteBuffer res = marsh.marshal(msg, 45); ByteBuffer slice = res.slice(); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index e14b74a..483922f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -174,7 +174,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { try { switch (scope) { case GLOBAL_SCOPE: { - byte[] data = state == null ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, state); + byte[] data = state == null ? null : MarshallerUtils.marshal(ctx, state); saved = getSpi(ses.getCheckpointSpi()).saveCheckpoint(key, data, timeout, override); @@ -205,7 +205,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { timeout = ses.getEndTime() - now; // Save it first to avoid getting null value on another node. - byte[] data = state == null ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, state); + byte[] data = state == null ? null : MarshallerUtils.marshal(ctx, state); Set<String> keys = keyMap.get(ses.getId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 3c33ee0..855fd8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -1118,7 +1118,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } else { if (topicOrd < 0) - ioMsg.topicBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, topic)); + ioMsg.topicBytes(MarshallerUtils.marshal(ctx, topic)); try { if ((CommunicationSpi)getSpi() instanceof TcpCommunicationSpi) @@ -1378,10 +1378,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa byte[] serTopic = null; if (!loc) { - serMsg = MarshallerUtils.marshal(ctx.gridName(), marsh, msg); + serMsg = MarshallerUtils.marshal(ctx, msg); if (topic != null) - serTopic = MarshallerUtils.marshal(ctx.gridName(), marsh, topic); + serTopic = MarshallerUtils.marshal(ctx, topic); } GridDeployment dep = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java index 78c1c3e..86ab22e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java @@ -446,7 +446,7 @@ class GridDeploymentCommunication { long start = U.currentTimeMillis(); if (req.responseTopic() != null && !ctx.localNodeId().equals(dstNode.id())) - req.responseTopicBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, req.responseTopic())); + req.responseTopicBytes(MarshallerUtils.marshal(ctx, req.responseTopic())); ctx.io().send(dstNode, TOPIC_CLASSLOAD, req, GridIoPolicy.P2P_POOL); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 6ec5d3c..7dabd81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -933,7 +933,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> ioMgr.addMessageListener(resTopic, resLsnr); - byte[] serFilter = MarshallerUtils.marshal(ctx.gridName(), marsh, p); + byte[] serFilter = MarshallerUtils.marshal(ctx, p); GridDeployment dep = ctx.deploy().deploy(p.getClass(), U.detectClassLoader(p.getClass())); @@ -1024,7 +1024,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> ctx.io().send(locNode, topic, msg, plc); if (!rmtNodes.isEmpty()) { - msg.responseTopicBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, msg.responseTopic())); + msg.responseTopicBytes(MarshallerUtils.marshal(ctx, msg.responseTopic())); ctx.io().send(rmtNodes, topic, msg, plc); } @@ -1144,8 +1144,8 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> log.debug("Sending event query response to node [nodeId=" + nodeId + "res=" + res + ']'); if (!ctx.localNodeId().equals(nodeId)) { - res.eventsBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, res.events())); - res.exceptionBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, res.exception())); + res.eventsBytes(MarshallerUtils.marshal(ctx, res.events())); + res.exceptionBytes(MarshallerUtils.marshal(ctx, res.exception())); } ctx.io().send(node, req.responseTopic(), res, PUBLIC_POOL); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java index 972fe80..1d205ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java @@ -412,7 +412,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> { * @throws IgniteCheckedException If failed. */ private byte[] marshal(Object obj) throws IgniteCheckedException { - return MarshallerUtils.marshal(ctx.gridName(), marsh, obj); + return MarshallerUtils.marshal(ctx, obj); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java index 939c14f..599a6bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java @@ -78,7 +78,7 @@ class GridAffinityUtils { throw new IgniteDeploymentCheckedException("Failed to deploy affinity object with class: " + cls.getName()); return new GridAffinityMessage( - MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), o), + MarshallerUtils.marshal(ctx, o), cls.getName(), dep.classLoaderId(), dep.deployMode(), http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 c59d9a6..8d0d99b 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 @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -94,7 +95,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { p.prepareMarshal(ctx); - bytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), p); + bytes = CU.marshal(ctx, p); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 e8c4ebc..096c2a8 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 @@ -23,6 +23,7 @@ import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -107,7 +108,7 @@ public class CacheInvokeDirectResult implements Message { key.prepareMarshal(ctx.cacheObjectContext()); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); if (res != null) res.prepareMarshal(ctx.cacheObjectContext()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index a0913ea..6264648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1891,4 +1891,16 @@ public class GridCacheUtils { ? DEFAULT_TX_CFG : cfg.getTransactionConfiguration(); } + + /** + * Marshal object. + * + * @param ctx Shared context. + * @param obj Object. + * @return Result. + * @throws IgniteCheckedException If failed. + */ + public static byte[] marshal(GridCacheSharedContext ctx, Object obj) throws IgniteCheckedException { + return MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), obj); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 d805660..260672a 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 @@ -31,6 +31,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -203,7 +204,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { prepareMarshalCacheObjects(vals, ctx.cacheContext(cacheId)); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 f208658..8b71d23 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 @@ -41,6 +41,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.marshaller.MarshallerUtils; @@ -333,7 +334,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage // Marshal txNodes only if there is a node in topology with an older version. if (ctx.exchange().minimumNodeVersion(topologyVersion()).compareTo(TX_NODES_DIRECT_MARSHALLABLE_SINCE) < 0) { if (txNodes != null && txNodesBytes == null) - txNodesBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), txNodes); + txNodesBytes = CU.marshal(ctx, txNodes); } else { if (txNodesMsg == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 180e446..84a5bc9 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 @@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -101,7 +102,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage super.prepareMarshal(ctx); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 1952730..fb8ca7a 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 @@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -107,7 +108,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { super.prepareMarshal(ctx); if (affAssignment != null) - affAssignmentBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), affAssignment); + affAssignmentBytes = CU.marshal(ctx, affAssignment); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 d60bb51..0c871e8 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 @@ -25,6 +25,7 @@ import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -112,7 +113,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { super.prepareMarshal(ctx); if (checkCommittedErr != null) - checkCommittedErrBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), checkCommittedErr); + checkCommittedErrBytes = CU.marshal(ctx, checkCommittedErr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 159deee..097b316 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 @@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -168,7 +169,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri prepareMarshalCacheObjects(nearEvicted, cctx); - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 e1d0b84..0ec7ba3 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 @@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.GridLongList; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -398,7 +399,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr super.prepareMarshal(ctx); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); GridCacheContext cctx = ctx.cacheContext(cacheId); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 723c41a..2f9b4de 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 @@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -172,7 +173,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa info.marshal(cctx); } - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 9c12962..3aadf93 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 @@ -27,6 +27,7 @@ import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -184,7 +185,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { super.prepareMarshal(ctx); if (topic != null) - topicBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), topic); + topicBytes = CU.marshal(ctx, topic); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 c455ca4..ad8de3d 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 @@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -134,10 +135,10 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa super.prepareMarshal(ctx); if (parts != null && partsBytes == null) - partsBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), parts); + partsBytes = CU.marshal(ctx, parts); if (partCntrs != null) - partCntrsBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), partCntrs); + partCntrsBytes = CU.marshal(ctx, partCntrs); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 b3ee57b..2daeb21 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 @@ -27,6 +27,7 @@ import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -138,10 +139,10 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes super.prepareMarshal(ctx); if (partsBytes == null && parts != null) - partsBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), parts); + partsBytes = CU.marshal(ctx, parts); if (partCntrs != null) - partCntrsBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), partCntrs); + partCntrsBytes = CU.marshal(ctx, partCntrs); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 d530d06..7060463 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 @@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.cache.version.GridCacheVersionable; import org.apache.ignite.internal.util.GridLeanSet; import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -191,7 +192,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe } if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 37af50a..fc1f442 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 @@ -27,6 +27,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheDeployable; import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo; import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -170,7 +171,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC } if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 753f5e3..b06aca5 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 @@ -24,6 +24,7 @@ import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -102,7 +103,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { super.prepareMarshal(ctx); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 b1615f1..28d8aef 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 @@ -32,6 +32,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.internal.util.typedef.internal.U; @@ -125,7 +126,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach GridCacheContext cctx = ctx.cacheContext(cacheId); if (err != null) - errBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.marshaller(), err); + errBytes = CU.marshal(ctx, err); metaDataBytes = marshalCollection(metadata, cctx); dataBytes = marshalCollection(data, cctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 8ad4249..461d31b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -1542,7 +1542,7 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler depInfo = new GridDeploymentInfoBean(dep); - bytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), obj); + bytes = MarshallerUtils.marshal(ctx, obj); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 8c756c1..30f99a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -1145,7 +1145,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { if (closureBytes == null) { closure = c.job; - closureBytes = MarshallerUtils.marshal(ctx.gridName(), marsh, c.job); + closureBytes = MarshallerUtils.marshal(ctx, c.job); } if (c.job == closure) http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index ef4e729..a205c2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -1324,7 +1324,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { if (!msg.messages() && msg.data() != null && (nodes.size() > 1 || !ctx.localNodeId().equals(F.first(nodes).id()))) - msg.dataBytes(MarshallerUtils.marshal(ctx.gridName(), marsh, msg.data())); + msg.dataBytes(MarshallerUtils.marshal(ctx, msg.data())); for (ClusterNode node : nodes) { int cnt = 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java index e1f8d6b..065f5ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java @@ -91,7 +91,7 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter { if (ctx.config().isDaemon()) return; - marshErrBytes = MarshallerUtils.marshal(ctx.gridName(), marsh, new IgniteCheckedException("Failed to marshal response error, " + + marshErrBytes = MarshallerUtils.marshal(ctx, new IgniteCheckedException("Failed to marshal response error, " + "see node log for details.")); flusher = new IgniteThread(new GridWorker(ctx.gridName(), "grid-data-loader-flusher", log) { @@ -332,7 +332,7 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter { byte[] errBytes; try { - errBytes = err != null ? MarshallerUtils.marshal(ctx.gridName(), marsh, err) : null; + errBytes = err != null ? MarshallerUtils.marshal(ctx, err) : null; } catch (Exception e) { U.error(log, "Failed to marshal error [err=" + err + ", marshErr=" + e + ']', e); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index 10f266e..01d17d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -1360,11 +1360,11 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed if (updaterBytes == null) { assert rcvr != null; - updaterBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), rcvr); + updaterBytes = MarshallerUtils.marshal(ctx, rcvr); } if (topicBytes == null) - topicBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), topic); + topicBytes = MarshallerUtils.marshal(ctx, topic); } catch (IgniteCheckedException e) { U.error(log, "Failed to marshal (request will not be sent).", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/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 c123201..87d145b 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 @@ -94,7 +94,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void prepareMarshal(Marshaller marsh, final GridKernalContext kernalCtx) throws IgniteCheckedException { + @Override public void prepareMarshal(Marshaller marsh, GridKernalContext kernalCtx) throws IgniteCheckedException { super.prepareMarshal(marsh, kernalCtx); if (err != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java index c971dc6..a3e84e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java @@ -93,8 +93,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void prepareMarshal(Marshaller marsh, - final GridKernalContext kernalCtx) throws IgniteCheckedException { + @Override public void prepareMarshal(Marshaller marsh, GridKernalContext kernalCtx) throws IgniteCheckedException { super.prepareMarshal(marsh, kernalCtx); if (err != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java index 7571797..9892bc8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java @@ -78,7 +78,7 @@ public class IgfsPaths implements Externalizable { else { ByteArrayOutputStream out = new ByteArrayOutputStream(); - MarshallerUtils.marshal(new JdkMarshaller(), payload, out, igfsCtx.kernalContext().config().getGridName()); + MarshallerUtils.marshal(igfsCtx.kernalContext().gridName(), new JdkMarshaller(), payload, out); payloadBytes = out.toByteArray(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 92bef35..f3907c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -404,7 +404,7 @@ public class GridJobProcessor extends GridProcessorAdapter { boolean loc = ctx.localNodeId().equals(taskNode.id()) && !ctx.config().isMarshalLocalJobs(); GridTaskSessionRequest req = new GridTaskSessionRequest(ses.getId(), ses.getJobId(), - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, attrs), attrs); + loc ? null : MarshallerUtils.marshal(ctx, attrs), attrs); Object topic = TOPIC_TASK.topic(ses.getJobId(), ctx.discovery().localNode().id()); @@ -517,7 +517,7 @@ public class GridJobProcessor extends GridProcessorAdapter { ctx.io().send(taskNode, TOPIC_JOB_SIBLINGS, new GridJobSiblingsRequest(ses.getId(), loc ? topic : null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, topic)), + loc ? null : MarshallerUtils.marshal(ctx, topic)), SYSTEM_POOL); // 4. Listen to discovery events. @@ -1334,11 +1334,11 @@ public class GridJobProcessor extends GridProcessorAdapter { locNodeId, req.getSessionId(), req.getJobId(), - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, ex), + loc ? null : MarshallerUtils.marshal(ctx, ex), ex, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, null), + loc ? null : MarshallerUtils.marshal(ctx, null), null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, null), + loc ? null : MarshallerUtils.marshal(ctx, null), null, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java index d9e256c..7af32ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java @@ -746,11 +746,11 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { ctx.localNodeId(), ses.getId(), ses.getJobId(), - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, ex), + loc ? null : MarshallerUtils.marshal(ctx, ex), loc ? ex : null, - loc ? null: MarshallerUtils.marshal(ctx.gridName(), marsh, res), + loc ? null: MarshallerUtils.marshal(ctx, res), loc ? res : null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, attrs), + loc ? null : MarshallerUtils.marshal(ctx, attrs), loc ? attrs : null, isCancelled()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java index bbcfbe5..2e9e957 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java @@ -109,7 +109,7 @@ public class GridOffHeapProcessor extends GridProcessorAdapter { private byte[] keyBytes(KeyCacheObject key, @Nullable byte[] keyBytes) throws IgniteCheckedException { assert key != null; - return keyBytes != null ? keyBytes : MarshallerUtils.marshal(ctx.gridName(), marsh, key); + return keyBytes != null ? keyBytes : MarshallerUtils.marshal(ctx, key); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java index 484dca0..1badaf9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java @@ -136,7 +136,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter { res.error(err.getMessage()); else { res.result(desc.result()); - res.resultBytes(MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), desc.result())); + res.resultBytes(MarshallerUtils.marshal(ctx, desc.result())); } } else @@ -495,7 +495,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter { // 2. Send message. try { - byte[] topicBytes = MarshallerUtils.marshal(ctx.gridName(), ctx.config().getMarshaller(), topic); + byte[] topicBytes = MarshallerUtils.marshal(ctx, topic); ctx.io().send(taskNode, TOPIC_REST, new GridTaskResultRequest(taskId, topic, topicBytes), SYSTEM_POOL); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index 4e44abe..d7873a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -25,7 +25,6 @@ import java.nio.charset.Charset; import java.util.Date; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest; import org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse; @@ -210,7 +209,7 @@ public class GridTcpRestParser implements GridNioParser { else { GridClientMarshaller marsh = marshaller(ses); - ByteBuffer res = MarshallerUtils.marshal(marsh, msg, 45, ses.gridName()); + ByteBuffer res = marsh.marshal(msg, 45); ByteBuffer slice = res.slice(); @@ -760,8 +759,7 @@ public class GridTcpRestParser implements GridNioParser { * @return Serialization flags. * @throws IgniteCheckedException If JDK serialization failed. */ - private int encodeObj(Object obj, ByteArrayOutputStream out, - final String gridName) throws IgniteCheckedException { + private int encodeObj(Object obj, ByteArrayOutputStream out, final String gridName) throws IgniteCheckedException { int flags = 0; byte[] data = null; @@ -809,7 +807,7 @@ public class GridTcpRestParser implements GridNioParser { flags |= BYTE_ARR_FLAG; } else { - MarshallerUtils.marshal(jdkMarshaller, obj, out, gridName); + MarshallerUtils.marshal(gridName, jdkMarshaller, obj, out); flags |= SERIALIZED_FLAG; } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index c90350f..3c2317e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -448,18 +448,16 @@ public class GridServiceProcessor extends GridProcessorAdapter { validate(cfg); if (!state.srvcCompatibility) { - Marshaller marsh = ctx.config().getMarshaller(); - LazyServiceConfiguration cfg0; try { - byte[] srvcBytes = MarshallerUtils.marshal(ctx.gridName(), marsh, cfg.getService()); + byte[] srvcBytes = MarshallerUtils.marshal(ctx, cfg.getService()); cfg0 = new LazyServiceConfiguration(cfg, srvcBytes); } catch (IgniteCheckedException e) { U.error(log, "Failed to marshal service with configured marshaller [srvc=" + cfg.getService() - + ", marsh=" + marsh + "]", e); + + ", marsh=" + ctx.config().getMarshaller() + "]", e); return new GridFinishedFuture<>(e); } @@ -1134,7 +1132,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { Service svc = cfg.getService(); try { - byte[] bytes = MarshallerUtils.marshal(ctx.gridName(), m, svc); + byte[] bytes = MarshallerUtils.marshal(ctx, svc); Service cp = MarshallerUtils.unmarshal(m, bytes, U.resolveClassLoader(svc.getClass().getClassLoader(), ctx.config()), ctx.gridName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index 57b915f..7cb097f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -914,7 +914,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { GridTaskSessionRequest req = new GridTaskSessionRequest( ses.getId(), null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, attrs), + loc ? null : MarshallerUtils.marshal(ctx, attrs), attrs); // Make sure to go through IO manager always, since order @@ -1315,7 +1315,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { ctx.io().send(nodeId, topic, new GridJobSiblingsResponse( loc ? siblings : null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, siblings)), + loc ? null : MarshallerUtils.marshal(ctx, siblings)), SYSTEM_POOL); } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index a4656f4..3089cc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -1254,16 +1254,16 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { ses.getTaskName(), ses.getUserVersion(), ses.getTaskClassName(), - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, res.getJob()), + loc ? null : MarshallerUtils.marshal(ctx, res.getJob()), loc ? res.getJob() : null, ses.getStartTime(), timeout, ses.getTopology(), - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, ses.getJobSiblings()), + loc ? null : MarshallerUtils.marshal(ctx, ses.getJobSiblings()), loc ? ses.getJobSiblings() : null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, sesAttrs), + loc ? null : MarshallerUtils.marshal(ctx, sesAttrs), loc ? sesAttrs : null, - loc ? null : MarshallerUtils.marshal(ctx.gridName(), marsh, jobAttrs), + loc ? null : MarshallerUtils.marshal(ctx, jobAttrs), loc ? jobAttrs : null, ses.getCheckpointSpi(), dep.classLoaderId(), http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java index 2f8eb08..ce143ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java @@ -18,51 +18,37 @@ package org.apache.ignite.marshaller; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.LocalGridName; +import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgnitionEx; +import org.apache.ignite.internal.LocalGridName; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.nio.ByteBuffer; /** * Utility marshaller methods. */ public final class MarshallerUtils { /** - * Marshal object. Used when grid name is not available, f.e. in tests. - * - * @param marsh Marshaller. - * @param obj Object to marshal. - * @return Result. - * @throws IgniteCheckedException If failed. - */ - public static byte[] marshal(final Marshaller marsh, final @Nullable Object obj) throws IgniteCheckedException { - // This method used to keep marshaller usages in one place. - return marsh.marshal(obj); - } - - /** - * Marshal object setting provided node name. + * Marshal object with provided node name. * - * @param gridName Node name. + * @param name Grid name. * @param marsh Marshaller. * @param obj Object to marshal. * @return Result. * @throws IgniteCheckedException If failed. */ - public static byte[] marshal(final String gridName, final Marshaller marsh, @Nullable Object obj) - throws IgniteCheckedException { + public static byte[] marshal(String name, Marshaller marsh, @Nullable Object obj) throws IgniteCheckedException { final LocalGridName gridNameTl = gridName(); final String gridNameStr = gridNameTl.getGridName(); final boolean init = gridNameTl.isSet(); try { - gridNameTl.setGridName(true, gridName); + gridNameTl.setGridName(true, name); return marsh.marshal(obj); } @@ -71,29 +57,24 @@ public final class MarshallerUtils { } } - - - - - /** * Marshal object to stream and set grid name thread local. * + * @param name Grid name. * @param marshaller Marshaller. * @param obj Object to marshal. * @param out Output stream. - * @param gridName Grid name. * @throws IgniteCheckedException If fail. */ - public static void marshal(final Marshaller marshaller, final @Nullable Object obj, - final OutputStream out, final String gridName) throws IgniteCheckedException { + public static void marshal(final String name, final Marshaller marshaller, final @Nullable Object obj, + final OutputStream out) throws IgniteCheckedException { final LocalGridName gridNameTl = gridName(); final String gridNameStr = gridNameTl.getGridName(); final boolean init = gridNameTl.isSet(); try { - gridNameTl.setGridName(true, gridName); + gridNameTl.setGridName(true, name); marshaller.marshal(obj, out); } finally { @@ -102,6 +83,30 @@ public final class MarshallerUtils { } /** + * Marshal object with node name taken from provided kernal context. + * + * @param ctx Kernal context. + * @param obj Object to marshal. + * @return Result. + * @throws IgniteCheckedException If failed. + */ + public static byte[] marshal(GridKernalContext ctx, @Nullable Object obj) throws IgniteCheckedException { + return marshal(ctx.gridName(), ctx.config().getMarshaller(), obj); + } + + + + + + + + + + + + + + /** * Unmarshal object from stream and set grid name thread local. * * @param marshaller Marshaller. @@ -110,7 +115,7 @@ public final class MarshallerUtils { * @param gridName Grid name. * @param <T> Target type. * @return Deserialized object. - * @throws IgniteCheckedException + * @throws IgniteCheckedException If failed. */ public static <T> T unmarshal(final Marshaller marshaller, InputStream in, @Nullable ClassLoader clsLdr, final String gridName) throws IgniteCheckedException { @@ -200,32 +205,6 @@ public final class MarshallerUtils { } /** - * Marshal object and set grid name thread local. - * - * @param gridMarshaller Grid marshaller. - * @param obj Object to marshal. - * @param off Offset. - * @param gridName Grid name. - * @return Serialized data. - * @throws IOException If fail. - */ - public static ByteBuffer marshal(GridClientMarshaller gridMarshaller, Object obj, int off, - String gridName) throws IOException { - final LocalGridName gridNameTl = gridName(); - - final String gridNameStr = gridNameTl.getGridName(); - final boolean init = gridNameTl.isSet(); - - try { - gridNameTl.setGridName(true, gridName); - - return gridMarshaller.marshal(obj, off); - } finally { - gridNameTl.setGridName(init, gridNameStr); - } - } - - /** * Unmarshal object and set grid name thread local. * * @param gridMarshaller Grid marshaller. http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java index da55499..f25bad3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsUtils.java @@ -94,7 +94,7 @@ final class SharedFsUtils { try { out = new FileOutputStream(file); - MarshallerUtils.marshal(m, data, out, igniteCfg.getGridName()); + MarshallerUtils.marshal(igniteCfg.getGridName(), m, data, out); } finally { U.close(out, log); http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index b53a81e..67e7798 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -430,8 +430,7 @@ class ClientImpl extends TcpDiscoveryImpl { throw new IgniteClientDisconnectedException(null, "Failed to send custom message: client is disconnected."); try { - sockWriter.sendMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, evt))); + sockWriter.sendMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, marshal(evt))); } catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal custom event: " + evt, e); @@ -684,9 +683,10 @@ class ClientImpl extends TcpDiscoveryImpl { // Use security-unsafe getter. Map<String, Object> attrs = new HashMap<>(node.getAttributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS) - )); + attrs.put( + IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS, + marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)) + ); node.setAttributes(attrs); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index be108f8..97696cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -742,8 +742,7 @@ class ServerImpl extends TcpDiscoveryImpl { /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) { try { - msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, evt))); + msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, marshal(evt))); } catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal custom event: " + evt, e); @@ -826,8 +825,7 @@ class ServerImpl extends TcpDiscoveryImpl { Map<String, Object> attrs = new HashMap<>(locNode.attributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, subj)); + attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, marshal(subj)); attrs.remove(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS); locNode.setAttributes(attrs); @@ -1242,9 +1240,10 @@ class ServerImpl extends TcpDiscoveryImpl { // Use security-unsafe getter. Map<String, Object> attrs = new HashMap<>(node.getAttributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, - attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS))); + attrs.put( + IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS, + marshal(attrs.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS)) + ); node.setAttributes(attrs); } @@ -2361,7 +2360,7 @@ class ServerImpl extends TcpDiscoveryImpl { for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values()) { if (msgBytes == null) { try { - msgBytes = MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, msg); + msgBytes = marshal(msg); } catch (IgniteCheckedException e) { U.error(log, "Failed to marshal message: " + msg, e); @@ -3139,8 +3138,7 @@ class ServerImpl extends TcpDiscoveryImpl { // Stick in authentication subject to node (use security-safe attributes for copy). Map<String, Object> attrs = new HashMap<>(node.getAttributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, subj)); + attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, marshal(subj)); node.setAttributes(attrs); } @@ -4858,9 +4856,8 @@ class ServerImpl extends TcpDiscoveryImpl { if (nextMsg != null) { try { - TcpDiscoveryCustomEventMessage ackMsg = new TcpDiscoveryCustomEventMessage( - getLocalNodeId(), nextMsg, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, nextMsg)); + TcpDiscoveryCustomEventMessage ackMsg = + new TcpDiscoveryCustomEventMessage(getLocalNodeId(), nextMsg, marshal(nextMsg)); ackMsg.topologyVersion(msg.topologyVersion()); @@ -5004,8 +5001,7 @@ class ServerImpl extends TcpDiscoveryImpl { msgObj); if (msgObj.isMutable()) - msg.message(msgObj, - MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, msgObj)); + msg.message(msgObj, marshal(msgObj)); } catch (Throwable e) { U.error(log, "Failed to unmarshal discovery custom message.", e); @@ -5932,7 +5928,7 @@ class ServerImpl extends TcpDiscoveryImpl { byte[] msgBytes = msgT.get2(); if (msgBytes == null) - msgBytes = MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, msg); + msgBytes = marshal(msg); if (msg instanceof TcpDiscoveryClientAckResponse) { if (clientVer == null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 30b83e5..7eb915e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -26,12 +26,15 @@ import java.util.Date; import java.util.List; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedDeque; + +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiThread; @@ -326,4 +329,15 @@ abstract class TcpDiscoveryImpl { return res; } + + /** + * Marshal object. + * + * @param obj Object. + * @return Result. + * @throws IgniteCheckedException If failed. + */ + protected byte[] marshal(Object obj) throws IgniteCheckedException { + return MarshallerUtils.marshal(spi.ignite().name(), spi.marsh, obj); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a7f99d92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index de9877c..9e4669a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -1378,7 +1378,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T IgniteCheckedException err = null; try { - MarshallerUtils.marshal(marsh, msg, out, ignite.configuration().getGridName()); + MarshallerUtils.marshal(ignite.name(), marsh, msg, out); } catch (IgniteCheckedException e) { err = e;
