IGNITE-4014 Fixed "Transaction hangs if entry processor failed during serialization". This closes #1148.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a6cfce6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a6cfce6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a6cfce6 Branch: refs/heads/ignite-ssl-hotfix Commit: 9a6cfce659df40b0a4624f19fd91c217b74bafea Parents: f9a0676 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Oct 11 13:59:57 2016 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Oct 11 13:59:58 2016 +0300 ---------------------------------------------------------------------- .../rendezvous/RendezvousAffinityFunction.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 4 +- .../internal/GridEventConsumeHandler.java | 8 +- .../internal/GridJobSiblingsResponse.java | 3 +- .../internal/GridMessageListenHandler.java | 8 +- .../internal/binary/BinaryEnumObjectImpl.java | 3 +- .../internal/binary/BinaryMarshaller.java | 2 +- .../internal/binary/BinaryWriterExImpl.java | 3 +- .../GridClientOptimizedMarshaller.java | 5 +- .../GridClientZipOptimizedMarshaller.java | 5 +- .../apache/ignite/internal/jdbc/JdbcUtils.java | 4 +- .../checkpoint/GridCheckpointManager.java | 6 +- .../managers/communication/GridIoManager.java | 12 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../eventstorage/GridEventStorageManager.java | 16 +- .../swapspace/GridSwapSpaceManager.java | 13 +- .../processors/affinity/GridAffinityUtils.java | 4 +- .../cache/CacheEntrySerializablePredicate.java | 4 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheMessage.java | 4 +- .../processors/cache/GridCacheProcessor.java | 13 +- .../processors/cache/GridCacheUtils.java | 2 +- .../GridDistributedLockResponse.java | 4 +- .../GridDistributedTxPrepareRequest.java | 4 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 12 +- .../dht/GridDhtTxFinishResponse.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +- .../atomic/GridNearAtomicUpdateResponse.java | 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 4 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../preloader/GridDhtPartitionsFullMessage.java | 8 +- .../GridDhtPartitionsSingleMessage.java | 8 +- .../distributed/near/GridNearGetResponse.java | 4 +- .../near/GridNearSingleGetResponse.java | 4 +- .../near/GridNearTxFinishResponse.java | 4 +- .../cache/query/GridCacheLocalQueryFuture.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 12 +- .../cache/query/GridCacheQueryResponse.java | 4 +- .../cache/query/GridCacheSqlQuery.java | 4 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 6 +- .../cache/transactions/IgniteTxEntry.java | 5 +- .../version/GridCacheRawVersionedEntry.java | 8 +- .../IgniteCacheObjectProcessorImpl.java | 3 +- .../closure/GridClosureProcessor.java | 8 +- .../continuous/GridContinuousProcessor.java | 6 +- .../processors/continuous/StartRequestData.java | 4 +- .../datastreamer/DataStreamProcessor.java | 8 +- .../datastreamer/DataStreamerImpl.java | 6 +- .../processors/igfs/IgfsAckMessage.java | 5 +- .../processors/igfs/IgfsDeleteMessage.java | 5 +- .../internal/processors/igfs/IgfsPaths.java | 4 +- .../processors/job/GridJobProcessor.java | 18 +- .../internal/processors/job/GridJobWorker.java | 8 +- .../offheap/GridOffHeapProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 10 +- .../rest/protocols/tcp/GridTcpRestParser.java | 4 +- .../service/GridServiceProcessor.java | 9 +- .../processors/task/GridTaskProcessor.java | 8 +- .../processors/task/GridTaskWorker.java | 14 +- .../ignite/internal/util/IgniteUtils.java | 199 +++++++ .../ignite/marshaller/jdk/JdkMarshaller.java | 8 +- .../optimized/OptimizedMarshaller.java | 14 +- .../spi/checkpoint/sharedfs/SharedFsUtils.java | 4 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 24 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +- .../TcpDiscoveryMulticastIpFinder.java | 4 +- .../TcpDiscoveryCustomEventMessage.java | 3 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../ignite/stream/socket/SocketStreamer.java | 3 +- ...eEntryProcessorExternalizableFailedTest.java | 588 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../communication/HadoopMarshallerFilter.java | 13 +- .../hibernate/CacheHibernateBlobStore.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../serialization/CacheEventDeserializer.java | 3 +- .../serialization/CacheEventSerializer.java | 3 +- .../ignite/cache/websession/WebSessionV2.java | 20 +- 82 files changed, 1040 insertions(+), 252 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 aa8680c..ec12973 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 @@ -370,7 +370,7 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza try { ByteArrayOutputStream out = new ByteArrayOutputStream(); - byte[] nodeHashBytes = ignite.configuration().getMarshaller().marshal(nodeHash); + byte[] nodeHashBytes = U.marshal(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/9a6cfce6/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java index 25f0f37..2739865 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java @@ -560,7 +560,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> { * @throws IgniteCheckedException If failed to convert. */ protected byte[] toBytes(Object obj) throws IgniteCheckedException { - return marsh.marshal(obj); + return U.marshal(marsh, obj); } /** @@ -575,7 +575,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> { if (bytes == null || bytes.length == 0) return null; - return marsh.unmarshal(bytes, getClass().getClassLoader()); + return U.unmarshal(marsh, bytes, getClass().getClassLoader()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 ed6998d..715f8a5 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 @@ -365,7 +365,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { depInfo = new GridDeploymentInfoBean(dep); - filterBytes = ctx.config().getMarshaller().marshal(filter); + filterBytes = U.marshal(ctx.config().getMarshaller(), filter); } } @@ -382,7 +382,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { if (dep == null) throw new IgniteDeploymentCheckedException("Failed to obtain deployment for class: " + clsName); - filter = ctx.config().getMarshaller().unmarshal(filterBytes, U.resolveClassLoader(dep.classLoader(), ctx.config())); + filter = U.unmarshal(ctx, filterBytes, U.resolveClassLoader(dep.classLoader(), ctx.config())); } } @@ -490,7 +490,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { void p2pMarshal(Marshaller marsh) throws IgniteCheckedException { assert marsh != null; - bytes = marsh.marshal(evt); + bytes = U.marshal(marsh, evt); } /** @@ -504,7 +504,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { assert evt == null; assert bytes != null; - evt = marsh.unmarshal(bytes, ldr); + evt = U.unmarshal(marsh, bytes, ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java index aa81cc5..727e79b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java @@ -23,6 +23,7 @@ import java.util.Collection; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.compute.ComputeJobSibling; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -74,7 +75,7 @@ public class GridJobSiblingsResponse implements Message { assert marsh != null; if (siblingsBytes != null) - siblings = marsh.unmarshal(siblingsBytes, null); + siblings = U.unmarshal(marsh, siblingsBytes, null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 1bca85c..0eeaa8a 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 @@ -154,9 +154,9 @@ public class GridMessageListenHandler implements GridContinuousHandler { assert ctx.config().isPeerClassLoadingEnabled(); if (topic != null) - topicBytes = ctx.config().getMarshaller().marshal(topic); + topicBytes = U.marshal(ctx.config().getMarshaller(), topic); - predBytes = ctx.config().getMarshaller().marshal(pred); + predBytes = U.marshal(ctx.config().getMarshaller(), pred); // Deploy only listener, as it is very likely to be of some user class. GridPeerDeployAware pda = U.peerDeployAware(pred); @@ -188,9 +188,9 @@ public class GridMessageListenHandler implements GridContinuousHandler { ClassLoader ldr = dep.classLoader(); if (topicBytes != null) - topic = ctx.config().getMarshaller().unmarshal(topicBytes, U.resolveClassLoader(ldr, ctx.config())); + topic = U.unmarshal(ctx, topicBytes, U.resolveClassLoader(ldr, ctx.config())); - pred = ctx.config().getMarshaller().unmarshal(predBytes, U.resolveClassLoader(ldr, ctx.config())); + pred = U.unmarshal(ctx, predBytes, U.resolveClassLoader(ldr, ctx.config())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index dcfcc9d..69de3f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -32,6 +32,7 @@ import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; import org.jetbrains.annotations.Nullable; @@ -247,7 +248,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac /** {@inheritDoc} */ @Override public byte[] valueBytes(CacheObjectContext cacheCtx) throws IgniteCheckedException { - return ctx.marshaller().marshal(this); + return U.marshal(ctx.marshaller(), this); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java index 168c61a..bd95103 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java @@ -90,7 +90,7 @@ public class BinaryMarshaller extends AbstractNodeNameAwareMarshaller { try { out.write(arr); } - catch (IOException e) { + catch (Exception e) { throw new BinaryObjectException("Failed to marshal the object: " + obj, e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java index 22b4d1f..1de0a65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java @@ -36,6 +36,7 @@ import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream; import org.apache.ignite.internal.binary.streams.BinaryOutputStream; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static java.nio.charset.StandardCharsets.UTF_8; @@ -174,7 +175,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje out.writeByte(GridBinaryMarshaller.OPTM_MARSH); try { - byte[] arr = ctx.optimizedMarsh().marshal(obj); + byte[] arr = U.marshal(ctx.optimizedMarsh(), obj); writeInt(arr.length); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java index a112736..3c65db6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java @@ -25,6 +25,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.internal.MarshallerContextAdapter; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.Nullable; @@ -84,7 +85,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { throw new IOException("Message serialization of given type is not supported: " + obj.getClass().getName()); - byte[] bytes = opMarsh.marshal(obj); + byte[] bytes = U.marshal(opMarsh, obj); ByteBuffer buf = ByteBuffer.allocate(off + bytes.length); @@ -104,7 +105,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { /** {@inheritDoc} */ @Override public <T> T unmarshal(byte[] bytes) throws IOException { try { - return opMarsh.unmarshal(bytes, null); + return U.unmarshal(opMarsh, bytes, null); } catch (IgniteCheckedException e) { throw new IOException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java index d9ce60e..b709634 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java @@ -30,6 +30,7 @@ import java.util.zip.ZipOutputStream; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.client.marshaller.GridClientMarshaller; import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.Nullable; @@ -131,7 +132,7 @@ public class GridClientZipOptimizedMarshaller extends GridClientOptimizedMarshal throw new IOException("Message serialization of given type is not supported: " + obj.getClass().getName()); - byte[] marshBytes = opMarsh.marshal(obj); + byte[] marshBytes = U.marshal(opMarsh, obj); boolean zip = marshBytes.length > 512; @@ -158,7 +159,7 @@ public class GridClientZipOptimizedMarshaller extends GridClientOptimizedMarshal byte[] marshBytes = Arrays.copyOfRange(bytes, 1, bytes.length); - return opMarsh.unmarshal(unzip ? unzipBytes(marshBytes) : marshBytes, null); + return U.unmarshal(opMarsh, unzip ? unzipBytes(marshBytes) : marshBytes, null); } catch (IgniteCheckedException e) { throw new IOException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java index ecea21f..04e4926 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcUtils.java @@ -67,7 +67,7 @@ class JdbcUtils { assert args != null; try { - return MARSHALLER.marshal(args); + return U.marshal(MARSHALLER, args); } catch (IgniteCheckedException e) { throw new SQLException("Failed to unmarshal result.", e); @@ -96,7 +96,7 @@ class JdbcUtils { assert bytes != null; try { - return MARSHALLER.unmarshal(bytes, null); + return U.unmarshal(MARSHALLER, bytes, null); } catch (IgniteCheckedException e) { throw new SQLException("Failed to unmarshal result.", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 6b95dad..9124caf 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 @@ -173,7 +173,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { try { switch (scope) { case GLOBAL_SCOPE: { - byte[] data = state == null ? null : marsh.marshal(state); + byte[] data = state == null ? null : U.marshal(marsh, state); saved = getSpi(ses.getCheckpointSpi()).saveCheckpoint(key, data, timeout, override); @@ -204,7 +204,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 : marsh.marshal(state); + byte[] data = state == null ? null : U.marshal(marsh, state); Set<String> keys = keyMap.get(ses.getId()); @@ -338,7 +338,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { // Always deserialize with task/session class loader. if (data != null) - state = marsh.unmarshal(data, U.resolveClassLoader(ses.getClassLoader(), ctx.config())); + state = U.unmarshal(marsh, data, U.resolveClassLoader(ses.getClassLoader(), ctx.config())); record(EVT_CHECKPOINT_LOADED, key); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 bd285b2..cd43318 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 @@ -527,7 +527,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa int topicOrd = msg.topicOrdinal(); msg.topic(topicOrd >= 0 ? GridTopic.fromOrdinal(topicOrd) : - marsh.unmarshal(msg.topicBytes(), U.resolveClassLoader(ctx.config()))); + U.unmarshal(marsh, msg.topicBytes(), U.resolveClassLoader(ctx.config()))); } if (!started) { @@ -1139,7 +1139,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } else { if (topicOrd < 0) - ioMsg.topicBytes(marsh.marshal(topic)); + ioMsg.topicBytes(U.marshal(marsh, topic)); try { if ((CommunicationSpi)getSpi() instanceof TcpCommunicationSpi) @@ -1399,10 +1399,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa byte[] serTopic = null; if (!loc) { - serMsg = marsh.marshal(msg); + serMsg = U.marshal(marsh, msg); if (topic != null) - serTopic = marsh.marshal(topic); + serTopic = U.marshal(marsh, topic); } GridDeployment dep = null; @@ -2059,7 +2059,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa // Unmarshall message topic if needed. if (msgTopic == null && msgTopicBytes != null) { - msgTopic = marsh.unmarshal(msgTopicBytes, + msgTopic = U.unmarshal(marsh, msgTopicBytes, U.resolveClassLoader(dep != null ? dep.classLoader() : null, ctx.config())); ioMsg.topic(msgTopic); // Save topic to avoid future unmarshallings. @@ -2069,7 +2069,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return; if (msgBody == null) { - msgBody = marsh.unmarshal(ioMsg.bodyBytes(), + msgBody = U.unmarshal(marsh, ioMsg.bodyBytes(), U.resolveClassLoader(dep != null ? dep.classLoader() : null, ctx.config())); ioMsg.body(msgBody); // Save body to avoid future unmarshallings. http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 d4b3568..a571ae4 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 @@ -182,7 +182,7 @@ class GridDeploymentCommunication { if (req.responseTopic() == null) { try { - req.responseTopic(marsh.unmarshal(req.responseTopicBytes(), U.resolveClassLoader(ctx.config()))); + req.responseTopic(U.unmarshal(marsh, req.responseTopicBytes(), U.resolveClassLoader(ctx.config()))); } catch (IgniteCheckedException e) { U.error(log, "Failed to process deployment request (will ignore): " + req, e); @@ -443,7 +443,7 @@ class GridDeploymentCommunication { long start = U.currentTimeMillis(); if (req.responseTopic() != null && !ctx.localNodeId().equals(dstNode.id())) - req.responseTopicBytes(marsh.marshal(req.responseTopic())); + req.responseTopicBytes(U.marshal(marsh, req.responseTopic())); ctx.io().send(dstNode, TOPIC_CLASSLOAD, req, GridIoPolicy.P2P_POOL); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 0095707..5b451a1 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 @@ -891,11 +891,11 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> try { if (res.eventsBytes() != null) - res.events(marsh.<Collection<Event>>unmarshal(res.eventsBytes(), + res.events(U.<Collection<Event>>unmarshal(marsh, res.eventsBytes(), U.resolveClassLoader(ctx.config()))); if (res.exceptionBytes() != null) - res.exception(marsh.<Throwable>unmarshal(res.exceptionBytes(), + res.exception(U.<Throwable>unmarshal(marsh, res.exceptionBytes(), U.resolveClassLoader(ctx.config()))); } catch (IgniteCheckedException e) { @@ -932,7 +932,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> ioMgr.addMessageListener(resTopic, resLsnr); - byte[] serFilter = marsh.marshal(p); + byte[] serFilter = U.marshal(marsh, p); GridDeployment dep = ctx.deploy().deploy(p.getClass(), U.detectClassLoader(p.getClass())); @@ -1023,7 +1023,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> ctx.io().send(locNode, topic, msg, plc); if (!rmtNodes.isEmpty()) { - msg.responseTopicBytes(marsh.marshal(msg.responseTopic())); + msg.responseTopicBytes(U.marshal(marsh, msg.responseTopic())); ctx.io().send(rmtNodes, topic, msg, plc); } @@ -1089,7 +1089,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> try { if (req.responseTopicBytes() != null) - req.responseTopic(marsh.unmarshal(req.responseTopicBytes(), U.resolveClassLoader(ctx.config()))); + req.responseTopic(U.unmarshal(marsh, req.responseTopicBytes(), U.resolveClassLoader(ctx.config()))); GridDeployment dep = ctx.deploy().getGlobalDeployment( req.deploymentMode(), @@ -1105,7 +1105,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> throw new IgniteDeploymentCheckedException("Failed to obtain deployment for event filter " + "(is peer class loading turned on?): " + req); - filter = marsh.unmarshal(req.filter(), U.resolveClassLoader(dep.classLoader(), ctx.config())); + filter = U.unmarshal(marsh, req.filter(), U.resolveClassLoader(dep.classLoader(), ctx.config())); // Resource injection. ctx.resource().inject(dep, dep.deployedClass(req.filterClassName()), filter); @@ -1140,8 +1140,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(marsh.marshal(res.events())); - res.exceptionBytes(marsh.marshal(res.exception())); + res.eventsBytes(U.marshal(marsh, res.events())); + res.exceptionBytes(U.marshal(marsh, res.exception())); } ctx.io().send(node, req.responseTopic(), res, PUBLIC_POOL); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 437603a..1d36b4e 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 @@ -400,18 +400,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> { if (swapBytes == null) return null; - return marsh.unmarshal(swapBytes, ldr != null ? ldr : U.gridClassLoader()); - } - - /** - * Marshals object. - * - * @param obj Object to marshal. - * @return Marshalled array. - * @throws IgniteCheckedException If failed. - */ - private byte[] marshal(Object obj) throws IgniteCheckedException { - return ctx.config().getMarshaller().marshal(obj); + return U.unmarshal(marsh, swapBytes, ldr != null ? ldr : U.gridClassLoader()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 2952ebc..c24dd2d 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 @@ -77,7 +77,7 @@ class GridAffinityUtils { throw new IgniteDeploymentCheckedException("Failed to deploy affinity object with class: " + cls.getName()); return new GridAffinityMessage( - ctx.config().getMarshaller().marshal(o), + U.marshal(ctx, o), cls.getName(), dep.classLoaderId(), dep.deployMode(), @@ -110,7 +110,7 @@ class GridAffinityUtils { throw new IgniteDeploymentCheckedException("Failed to obtain affinity object (is peer class loading turned on?): " + msg); - Object src = ctx.config().getMarshaller().unmarshal(msg.source(), + Object src = U.unmarshal(ctx, msg.source(), U.resolveClassLoader(dep.classLoader(), ctx.config())); // Resource injection. http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 5f52cf7..623fc4b 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 @@ -80,7 +80,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { assert p != null || bytes != null; if (p == null) { - p = ctx.marshaller().unmarshal(bytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + p = U.unmarshal(ctx.marshaller(), bytes, U.resolveClassLoader(ldr, ctx.gridConfig())); p.finishUnmarshal(ctx, ldr); } @@ -93,7 +93,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { p.prepareMarshal(ctx); if (bytes == null) - bytes = ctx.marshaller().marshal(p); + bytes = U.marshal(ctx.marshaller(), p); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 5dea51b..0d519f7 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 @@ -106,7 +106,7 @@ public class CacheInvokeDirectResult implements Message { key.prepareMarshal(ctx.cacheObjectContext()); if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx.marshaller(), err); if (res != null) res.prepareMarshal(ctx.cacheObjectContext()); @@ -121,7 +121,7 @@ public class CacheInvokeDirectResult implements Message { key.finishUnmarshal(ctx.cacheObjectContext(), ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx.marshaller(), errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (res != null) res.finishUnmarshal(ctx.cacheObjectContext(), ldr); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index c5407b8..71f99d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -458,7 +458,7 @@ public abstract class GridCacheMessage implements Message { Marshaller marsh = ctx.marshaller(); for (int i = 0; i < byteCol.length; i++) - args[i] = byteCol[i] == null ? null : marsh.unmarshal(byteCol[i], U.resolveClassLoader(ldr, ctx.gridConfig())); + args[i] = byteCol[i] == null ? null : U.unmarshal(marsh, byteCol[i], U.resolveClassLoader(ldr, ctx.gridConfig())); return args; } @@ -609,7 +609,7 @@ public abstract class GridCacheMessage implements Message { Marshaller marsh = ctx.marshaller(); for (byte[] bytes : byteCol) - col.add(bytes == null ? null : marsh.<T>unmarshal(bytes, U.resolveClassLoader(ldr, ctx.gridConfig()))); + col.add(bytes == null ? null : U.<T>unmarshal(marsh, bytes, U.resolveClassLoader(ldr, ctx.gridConfig()))); return col; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 0a0b40a..fd6abbd 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -117,7 +117,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerUtils; -import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.spi.IgniteNodeValidationResult; import org.jetbrains.annotations.Nullable; @@ -185,8 +184,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** */ private IdentityHashMap<CacheStore, ThreadLocal> sesHolders = new IdentityHashMap<>(); - /** Must use JDK marshaller since it is used by discovery to fire custom events. */ - private final Marshaller marshaller; + /** Must use JDK marsh since it is used by discovery to fire custom events. */ + private final Marshaller marsh; /** Count down latch for caches. */ private final CountDownLatch cacheStartedLatch = new CountDownLatch(1); @@ -207,7 +206,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { jCacheProxies = new ConcurrentHashMap<>(); stopSeq = new LinkedList<>(); - marshaller = MarshallerUtils.jdkMarshaller(ctx.gridName()); + marsh = MarshallerUtils.jdkMarshaller(ctx.gridName()); } /** @@ -3563,7 +3562,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (ldr == null) ldr = val.getCacheStoreFactory().getClass().getClassLoader(); - marshaller.unmarshal(marshaller.marshal(val.getCacheStoreFactory()), + U.unmarshal(marsh, U.marshal(marsh, val.getCacheStoreFactory()), U.resolveClassLoader(ldr, ctx.config())); } catch (IgniteCheckedException e) { @@ -3573,7 +3572,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } try { - return marshaller.unmarshal(marshaller.marshal(val), U.resolveClassLoader(ctx.config())); + return U.unmarshal(marsh, U.marshal(marsh, val), U.resolveClassLoader(ctx.config())); } catch (IgniteCheckedException e) { throw new IgniteCheckedException("Failed to validate cache configuration " + @@ -3615,7 +3614,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { public <T> T clone(final T obj) throws IgniteCheckedException { return withBinaryContext(new IgniteOutClosureX<T>() { @Override public T applyx() throws IgniteCheckedException { - return marshaller.unmarshal(marshaller.marshal(obj), U.resolveClassLoader(ctx.config())); + return U.unmarshal(marsh, U.marshal(marsh, obj), U.resolveClassLoader(ctx.config())); } }); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 0f4e89b..4c18f21 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 @@ -895,7 +895,7 @@ public class GridCacheUtils { } } - return ctx.marshaller().marshal(obj); + return U.marshal(ctx, obj); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 1763ff9..61a2388 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 && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx.marshaller(), err); } /** {@inheritDoc} */ @@ -204,7 +204,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { finishUnmarshalCacheObjects(vals, ctx.cacheContext(cacheId), ldr); if (errBytes != null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 c691374..7b1dcc5 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 @@ -334,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 = ctx.marshaller().marshal(txNodes); + txNodesBytes = U.marshal(ctx, txNodes); } else { if (txNodesMsg == null) @@ -374,7 +374,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage txNodes = F.viewReadOnly(txNodesMsg, MSG_TO_COL); if (txNodesBytes != null && txNodes == null) - txNodes = ctx.marshaller().unmarshal(txNodesBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + txNodes = U.unmarshal(ctx, txNodesBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 850c095..6c127c3 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 @@ -100,7 +100,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage super.prepareMarshal(ctx); if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -108,7 +108,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage super.finishUnmarshal(ctx, ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 e883614..cad1617 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 @@ -207,13 +207,13 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { assert affAssignment != null ^ affAssignmentIds != null; if (affAssignment != null && affAssignmentBytes == null) - affAssignmentBytes = ctx.marshaller().marshal(affAssignment); + affAssignmentBytes = U.marshal(ctx, affAssignment); if (affAssignmentIds != null && affAssignmentIdsBytes == null) - affAssignmentIdsBytes = ctx.marshaller().marshal(affAssignmentIds); + affAssignmentIdsBytes = U.marshal(ctx, affAssignmentIds); if (idealAffAssignment != null && idealAffAssignmentBytes == null) - idealAffAssignmentBytes = ctx.marshaller().marshal(idealAffAssignment); + idealAffAssignmentBytes = U.marshal(ctx, idealAffAssignment); } /** {@inheritDoc} */ @@ -228,10 +228,10 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { affAssignment = unmarshalNodes(affAssignmentBytes, ctx, ldr); if (affAssignmentIdsBytes != null && affAssignmentIds == null) - affAssignmentIds = ctx.marshaller().unmarshal(affAssignmentIdsBytes, ldr); + affAssignmentIds = U.unmarshal(ctx, affAssignmentIdsBytes, ldr); if (idealAffAssignmentBytes != null && idealAffAssignment == null) - idealAffAssignment = ctx.marshaller().unmarshal(idealAffAssignmentBytes, ldr); + idealAffAssignment = U.unmarshal(ctx, idealAffAssignmentBytes, ldr); } /** @@ -247,7 +247,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { ClassLoader ldr) throws IgniteCheckedException { - List<List<ClusterNode>> affAssignment = ctx.marshaller().unmarshal(bytes, + List<List<ClusterNode>> affAssignment = U.unmarshal(ctx, bytes, U.resolveClassLoader(ldr, ctx.gridConfig())); // TODO IGNITE-2110: setting 'local' for nodes not needed when IGNITE-2110 is implemented. http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 0618172..8fb1f4e 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 @@ -115,7 +115,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { super.prepareMarshal(ctx); if (checkCommittedErr != null && checkCommittedErrBytes == null) - checkCommittedErrBytes = ctx.marshaller().marshal(checkCommittedErr); + checkCommittedErrBytes = U.marshal(ctx, checkCommittedErr); if (retVal != null && retVal.cacheId() != 0) { GridCacheContext cctx = ctx.cacheContext(retVal.cacheId()); @@ -132,7 +132,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { super.finishUnmarshal(ctx, ldr); if (checkCommittedErrBytes != null && checkCommittedErr == null) - checkCommittedErr = ctx.marshaller().unmarshal(checkCommittedErrBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + checkCommittedErr = U.unmarshal(ctx, checkCommittedErrBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (retVal != null && retVal.cacheId() != 0) { GridCacheContext cctx = ctx.cacheContext(retVal.cacheId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 1334819..ff12af0 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 @@ -168,7 +168,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri prepareMarshalCacheObjects(nearEvicted, cctx); if (errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -182,7 +182,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri finishUnmarshalCacheObjects(nearEvicted, cctx, ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 eb9be4d..5057fbb 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 @@ -659,7 +659,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri } if (expiryPlcBytes != null && expiryPlc == null) - expiryPlc = ctx.marshaller().unmarshal(expiryPlcBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + expiryPlc = U.unmarshal(ctx, expiryPlcBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (partIds != null && !partIds.isEmpty()) { assert partIds.size() == keys.size(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 ff4008e..2e38733 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 @@ -397,7 +397,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr super.prepareMarshal(ctx); if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); GridCacheContext cctx = ctx.cacheContext(cacheId); @@ -416,7 +416,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr super.finishUnmarshal(ctx, ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); GridCacheContext cctx = ctx.cacheContext(cacheId); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 fcdf402..8d90158 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 @@ -172,7 +172,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa } if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -190,7 +190,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa } if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 d90ada8..bb952d4 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 @@ -185,7 +185,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { super.prepareMarshal(ctx); if (topic != null && topicBytes == null) - topicBytes = ctx.marshaller().marshal(topic); + topicBytes = U.marshal(ctx, topic); } /** {@inheritDoc} */ @@ -193,7 +193,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { super.finishUnmarshal(ctx, ldr); if (topicBytes != null && topic == null) - topic = ctx.marshaller().unmarshal(topicBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + topic = U.unmarshal(ctx, topicBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 49942a1..a4ff04b 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 @@ -133,10 +133,10 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa super.prepareMarshal(ctx); if (parts != null && partsBytes == null) - partsBytes = ctx.marshaller().marshal(parts); + partsBytes = U.marshal(ctx, parts); if (partCntrs != null && partCntrsBytes == null) - partCntrsBytes = ctx.marshaller().marshal(partCntrs); + partCntrsBytes = U.marshal(ctx, partCntrs); } /** @@ -158,13 +158,13 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa super.finishUnmarshal(ctx, ldr); if (partsBytes != null && parts == null) - parts = ctx.marshaller().unmarshal(partsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + parts = U.unmarshal(ctx, partsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (parts == null) parts = new HashMap<>(); if (partCntrsBytes != null && partCntrs == null) - partCntrs = ctx.marshaller().unmarshal(partCntrsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + partCntrs = U.unmarshal(ctx, partCntrsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (partCntrs == null) partCntrs = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 a2be0b0..e4356b1 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 @@ -137,10 +137,10 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes super.prepareMarshal(ctx); if (partsBytes == null && parts != null) - partsBytes = ctx.marshaller().marshal(parts); + partsBytes = U.marshal(ctx, parts); if (partCntrsBytes == null && partCntrs != null) - partCntrsBytes = ctx.marshaller().marshal(partCntrs); + partCntrsBytes = U.marshal(ctx, partCntrs); } /** {@inheritDoc} */ @@ -148,10 +148,10 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes super.finishUnmarshal(ctx, ldr); if (partsBytes != null && parts == null) - parts = ctx.marshaller().unmarshal(partsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + parts = U.unmarshal(ctx, partsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (partCntrsBytes != null && partCntrs == null) - partCntrs = ctx.marshaller().unmarshal(partCntrsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + partCntrs = U.unmarshal(ctx, partCntrsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 f298515..049431e 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 @@ -190,7 +190,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe } if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -205,7 +205,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe } if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 95799b2..bbc968d 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 @@ -169,7 +169,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC } if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -188,7 +188,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC } if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 0bdb09b..37fbb36 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 @@ -101,7 +101,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { super.prepareMarshal(ctx); if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); } /** {@inheritDoc} */ @@ -109,7 +109,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { super.finishUnmarshal(ctx, ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java index 91ae12c..6eaca29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -113,11 +113,11 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap Marshaller marsh = cctx.marshaller(); IgniteReducer<Object, Object> rdc = qry.reducer() != null ? - marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(qry.reducer()), + U.<IgniteReducer<Object, Object>>unmarshal(marsh, U.marshal(marsh, qry.reducer()), U.resolveClassLoader(cctx.gridConfig())) : null; IgniteClosure<Object, Object> trans = qry.transform() != null ? - marsh.<IgniteClosure<Object, Object>>unmarshal(marsh.marshal(qry.transform()), + U.<IgniteClosure<Object, Object>>unmarshal(marsh, U.marshal(marsh, qry.transform()), U.resolveClassLoader(cctx.gridConfig())) : null; return new GridCacheQueryInfo( http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 5610bef..60c4662 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 @@ -319,16 +319,16 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache Marshaller mrsh = ctx.marshaller(); if (keyValFilterBytes != null && keyValFilter == null) - keyValFilter = mrsh.unmarshal(keyValFilterBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + keyValFilter = U.unmarshal(mrsh, keyValFilterBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (rdcBytes != null && rdc == null) - rdc = mrsh.unmarshal(rdcBytes, ldr); + rdc = U.unmarshal(mrsh, rdcBytes, ldr); if (transBytes != null && trans == null) - trans = mrsh.unmarshal(transBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + trans = U.unmarshal(mrsh, transBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (argsBytes != null && args == null) - args = mrsh.unmarshal(argsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + args = U.unmarshal(mrsh, argsBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); } /** {@inheritDoc} */ @@ -343,9 +343,9 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache void beforeLocalExecution(GridCacheContext ctx) throws IgniteCheckedException { Marshaller marsh = ctx.marshaller(); - rdc = rdc != null ? marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(rdc), + rdc = rdc != null ? U.<IgniteReducer<Object, Object>>unmarshal(marsh, U.marshal(marsh, rdc), U.resolveClassLoader(ctx.gridConfig())) : null; - trans = trans != null ? marsh.<IgniteClosure<Object, Object>>unmarshal(marsh.marshal(trans), + trans = trans != null ? U.<IgniteClosure<Object, Object>>unmarshal(marsh, U.marshal(marsh, trans), U.resolveClassLoader(ctx.gridConfig())) : null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 9a03bdc..8492c38 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 @@ -124,7 +124,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach GridCacheContext cctx = ctx.cacheContext(cacheId); if (err != null && errBytes == null) - errBytes = ctx.marshaller().marshal(err); + errBytes = U.marshal(ctx, err); if (metaDataBytes == null) metaDataBytes = marshalCollection(metadata, cctx); @@ -149,7 +149,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach super.finishUnmarshal(ctx, ldr); if (errBytes != null && err == null) - err = ctx.marshaller().unmarshal(errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); + err = U.unmarshal(ctx, errBytes, U.resolveClassLoader(ldr, ctx.gridConfig())); if (metadata == null) metadata = unmarshalCollection(metaDataBytes, ctx, ldr); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java index bcb37c5..4dd3636 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java @@ -141,7 +141,7 @@ public class GridCacheSqlQuery implements Message { assert params != null; - paramsBytes = m.marshal(params); + paramsBytes = U.marshal(m, params); } /** @@ -160,7 +160,7 @@ public class GridCacheSqlQuery implements Message { // To avoid deserializing of enum types. params = ((BinaryMarshaller)m).binaryMarshaller().unmarshal(paramsBytes, ldr); else - params = m.unmarshal(paramsBytes, ldr); + params = U.unmarshal(m, paramsBytes, ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 a5752ed..4b5074c 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 @@ -1562,7 +1562,7 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler depInfo = new GridDeploymentInfoBean(dep); - bytes = ctx.config().getMarshaller().marshal(obj); + bytes = U.marshal(ctx, obj); } /** @@ -1580,7 +1580,7 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler if (dep == null) throw new IgniteDeploymentCheckedException("Failed to obtain deployment for class: " + clsName); - return ctx.config().getMarshaller().unmarshal(bytes, U.resolveClassLoader(dep.classLoader(), ctx.config())); + return U.unmarshal(ctx, bytes, U.resolveClassLoader(dep.classLoader(), ctx.config())); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index a8b2da4..e95622c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -153,7 +153,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b status = 0; - data = MARSHALLER.marshal(F.asList(schemasMap, indexesInfo)); + data = U.marshal(MARSHALLER, F.asList(schemasMap, indexesInfo)); } catch (Throwable t) { U.error(log, "Failed to get metadata for JDBC.", t); @@ -163,7 +163,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b status = 1; try { - data = MARSHALLER.marshal(err); + data = U.marshal(MARSHALLER, err); } catch (IgniteCheckedException e) { throw new IgniteException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index 26d4b82..ca08ead 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -84,7 +84,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { try { assert arg != null; - Map<String, Object> args = MARSHALLER.unmarshal(arg, null); + Map<String, Object> args = U.unmarshal(MARSHALLER, arg, null); boolean first = true; @@ -165,12 +165,12 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { if (res.getException() == null) { status = 0; - bytes = MARSHALLER.marshal(res.getData()); + bytes = U.marshal(MARSHALLER, res.getData()); } else { status = 1; - bytes = MARSHALLER.marshal(new SQLException(res.getException().getMessage())); + bytes = U.marshal(MARSHALLER, new SQLException(res.getException().getMessage())); } byte[] packet = new byte[bytes.length + 1]; http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/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 194208e..fde1f52 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 @@ -922,8 +922,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { // Unmarshal transform closure anyway if it exists. if (transformClosBytes != null && entryProcessorsCol == null) - entryProcessorsCol = ctx.marshaller().unmarshal(transformClosBytes, - U.resolveClassLoader(clsLdr, ctx.gridConfig())); + entryProcessorsCol = U.unmarshal(ctx, transformClosBytes, U.resolveClassLoader(clsLdr, ctx.gridConfig())); if (filters == null) filters = CU.empty0(); @@ -941,7 +940,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { val.unmarshal(this.ctx, clsLdr); if (expiryPlcBytes != null && expiryPlc == null) - expiryPlc = ctx.marshaller().unmarshal(expiryPlcBytes, U.resolveClassLoader(clsLdr, ctx.gridConfig())); + expiryPlc = U.unmarshal(ctx, expiryPlcBytes, U.resolveClassLoader(clsLdr, ctx.gridConfig())); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 4c5a704..b7c96b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@ -191,7 +191,7 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen unmarshalKey(ctx, marsh); if (val == null && valBytes != null) { - val = marsh.unmarshal(valBytes, U.resolveClassLoader(ctx.kernalContext().config())); + val = U.unmarshal(marsh, valBytes, U.resolveClassLoader(ctx.kernalContext().config())); val.finishUnmarshal(ctx, null); } @@ -222,7 +222,7 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen if (key == null) { assert keyBytes != null; - key = marsh.unmarshal(keyBytes, U.resolveClassLoader(ctx.kernalContext().config())); + key = U.unmarshal(marsh, keyBytes, U.resolveClassLoader(ctx.kernalContext().config())); key.finishUnmarshal(ctx, null); } @@ -239,13 +239,13 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen if (keyBytes == null) { key.prepareMarshal(ctx); - keyBytes = marsh.marshal(key); + keyBytes = U.marshal(marsh, key); } if (valBytes == null && val != null) { val.prepareMarshal(ctx); - valBytes = marsh.marshal(val); + valBytes = U.marshal(marsh, val); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/9a6cfce6/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 9fd4c1f..0eac610 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -103,8 +103,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme /** {@inheritDoc} */ @Override public Object unmarshal(CacheObjectContext ctx, byte[] bytes, ClassLoader clsLdr) throws IgniteCheckedException { - return ctx.kernalContext().cache().context().marshaller().unmarshal(bytes, U.resolveClassLoader(clsLdr, - ctx.kernalContext().config())); + return U.unmarshal(ctx.kernalContext(), bytes, U.resolveClassLoader(clsLdr, ctx.kernalContext().config())); } /** {@inheritDoc} */
