Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD8EE1052F for ; Thu, 4 Dec 2014 23:24:47 +0000 (UTC) Received: (qmail 50242 invoked by uid 500); 4 Dec 2014 23:24:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50173 invoked by uid 500); 4 Dec 2014 23:24:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 50156 invoked by uid 99); 4 Dec 2014 23:24:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2014 23:24:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 Dec 2014 23:24:22 +0000 Received: (qmail 47431 invoked by uid 99); 4 Dec 2014 23:23:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2014 23:23:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2880AA1D502; Thu, 4 Dec 2014 23:23:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 04 Dec 2014 23:24:31 -0000 Message-Id: <03b3109a517d4a76b267a3b685fbae14@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/53] [abbrv] incubator-ignite git commit: # gg-9470-rename X-Virus-Checked: Checked by ClamAV on apache.org # gg-9470-rename Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78892777 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78892777 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78892777 Branch: refs/heads/master Commit: 78892777f34de9e05ce3f20ac78a0021cf92d0ba Parents: a7c947c Author: sboikov Authored: Thu Dec 4 22:36:49 2014 +0300 Committer: sboikov Committed: Thu Dec 4 22:36:56 2014 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 2 +- .../processors/rest/GridTestMemcacheClient.java | 2 +- .../configuration/IgniteConfiguration.java | 6 +- .../marshaller/GridAbstractMarshaller.java | 57 -------- .../ignite/marshaller/GridMarshaller.java | 128 ---------------- .../marshaller/GridMarshallerExclusions.java | 145 ------------------- .../marshaller/IgniteAbstractMarshaller.java | 57 ++++++++ .../ignite/marshaller/IgniteMarshaller.java | 128 ++++++++++++++++ .../marshaller/IgniteMarshallerExclusions.java | 145 +++++++++++++++++++ .../marshaller/jdk/IgniteJdkMarshaller.java | 4 +- .../IgniteJdkMarshallerObjectOutputStream.java | 2 +- .../IgniteOptimizedClassDescriptor.java | 2 +- .../optimized/IgniteOptimizedMarshaller.java | 4 +- .../resources/IgniteMarshallerResource.java | 2 +- .../GridCacheRendezvousAffinityFunction.java | 2 +- .../store/jdbc/GridCacheJdbcBlobStore.java | 2 +- .../grid/kernal/GridEventConsumeHandler.java | 4 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../grid/kernal/GridJobSiblingsResponse.java | 2 +- .../org/gridgain/grid/kernal/GridKernal.java | 2 +- .../checkpoint/GridCheckpointManager.java | 2 +- .../managers/communication/GridIoManager.java | 2 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../managers/indexing/GridIndexingManager.java | 2 +- .../swapspace/GridSwapSpaceManager.java | 2 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryInfo.java | 2 +- .../processors/cache/GridCacheMessage.java | 8 +- .../cache/GridCacheSharedContext.java | 2 +- .../cache/query/GridCacheLocalQueryFuture.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 4 +- .../GridCacheContinuousQueryEntry.java | 6 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../closure/GridClosureProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 6 +- .../dataload/GridDataLoaderProcessor.java | 2 +- .../processors/dr/GridRawVersionedEntry.java | 6 +- .../processors/dr/GridVersionedEntry.java | 4 +- .../processors/ggfs/GridGgfsAckMessage.java | 4 +- .../ggfs/GridGgfsCommunicationMessage.java | 4 +- .../processors/ggfs/GridGgfsDeleteMessage.java | 4 +- .../kernal/processors/job/GridJobProcessor.java | 2 +- .../kernal/processors/job/GridJobWorker.java | 2 +- .../offheap/GridOffHeapProcessor.java | 2 +- .../resource/GridResourceCustomInjector.java | 4 +- .../resource/GridResourceProcessor.java | 2 +- .../tcp/GridMemcachedMessageWrapper.java | 6 +- .../tcp/GridTcpMemcachedNioListener.java | 2 +- .../rest/protocols/tcp/GridTcpRestParser.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 4 +- .../service/GridServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 2 +- .../kernal/processors/task/GridTaskWorker.java | 2 +- .../sharedfs/GridSharedFsCheckpointSpi.java | 2 +- .../sharedfs/GridSharedFsTimeoutTask.java | 4 +- .../checkpoint/sharedfs/GridSharedFsUtils.java | 4 +- .../tcp/GridTcpCommunicationSpi.java | 2 +- .../spi/discovery/tcp/GridTcpDiscoverySpi.java | 2 +- .../tcp/GridTcpDiscoverySpiAdapter.java | 2 +- .../GridTcpDiscoveryMulticastIpFinder.java | 2 +- .../spi/indexing/GridIndexingEntityAdapter.java | 2 +- .../swapspace/file/GridFileSwapSpaceSpi.java | 2 +- .../org/gridgain/jdbc/util/GridJdbcUtils.java | 2 +- .../GridOptimizedMarshallerSelfTest.java | 2 +- .../optimized/GridOptimizedMarshallerTest.java | 14 +- .../GridOptimizedObjectStreamSelfTest.java | 2 +- .../grid/GridExternalizableAbstractTest.java | 4 +- .../java/org/gridgain/grid/GridTestIoUtils.java | 2 +- .../grid/ggfs/GridGgfsPathSelfTest.java | 2 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 2 +- .../kernal/GridTopicExternalizableSelfTest.java | 16 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- .../processors/cache/GridCacheMvccSelfTest.java | 2 +- .../dataload/GridDataLoaderImplSelfTest.java | 4 +- .../ggfs/GridGgfsFileInfoSelfTest.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 4 +- .../marshaller/GridMarshallerResourceBean.java | 2 +- .../jdk/GridJdkMarshallerSelfTest.java | 2 +- .../GridSessionCheckpointAbstractSelfTest.java | 6 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- .../GridAbstractDiscoverySelfTest.java | 2 +- .../util/future/GridFinishedFutureSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../testframework/junits/GridTestResources.java | 6 +- .../GridHadoopExternalCommunication.java | 4 +- .../GridHadoopMarshallerFilter.java | 4 +- ...GridHadoopExternalCommunicationSelfTest.java | 2 +- .../hibernate/GridCacheHibernateBlobStore.java | 2 +- .../grid/spi/indexing/h2/GridH2IndexingSpi.java | 2 +- .../GridIndexingSpiAbstractSelfTest.java | 4 +- .../grid/kernal/GridFactorySelfTest.java | 2 +- .../GridSpringBeanSerializationSelfTest.java | 2 +- .../GridResourceFieldInjectionSelfTest.java | 2 +- .../GridResourceMethodInjectionSelfTest.java | 4 +- 97 files changed, 472 insertions(+), 472 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java index 2a7cf00..a43b92a 100644 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java @@ -101,7 +101,7 @@ public class GridS3CheckpointSpi extends GridSpiAdapter implements GridCheckpoin /** Marshaller. */ @IgniteMarshallerResource - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** Task that takes care about outdated files. */ private GridS3TimeoutWorker timeoutWrk; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java index bf02c2b..9292b88 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java @@ -61,7 +61,7 @@ final class GridTestMemcacheClient { private final IgniteLogger log = new IgniteJavaLogger(); /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); + private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** Socket. */ private final Socket sock; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index a6f0d33..85516d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -282,7 +282,7 @@ public class IgniteConfiguration { private UUID nodeId; /** Marshaller. */ - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** Marshal local jobs. */ private boolean marshLocJobs = DFLT_MARSHAL_LOCAL_JOBS; @@ -1459,7 +1459,7 @@ public class IgniteConfiguration { * * @return Marshaller to use in grid. */ - public GridMarshaller getMarshaller() { + public IgniteMarshaller getMarshaller() { return marsh; } @@ -1469,7 +1469,7 @@ public class IgniteConfiguration { * @param marsh Marshaller to use within grid. * @see IgniteConfiguration#getMarshaller() */ - public void setMarshaller(GridMarshaller marsh) { + public void setMarshaller(IgniteMarshaller marsh) { this.marsh = marsh; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java deleted file mode 100644 index 40fd1ad..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java +++ /dev/null @@ -1,57 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller; - -import org.gridgain.grid.*; -import org.gridgain.grid.util.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.io.*; -import org.jetbrains.annotations.*; - -/** - * Base class for marshallers. Provides default implementations of methods - * that work with byte array or {@link GridByteArrayList}. These implementations - * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream} - * to marshal and unmarshal objects. - */ -public abstract class GridAbstractMarshaller implements GridMarshaller { - /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */ - public static final int DFLT_BUFFER_SIZE = 512; - - /** {@inheritDoc} */ - @Override public byte[] marshal(@Nullable Object obj) throws GridException { - GridByteArrayOutputStream out = null; - - try { - out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE); - - marshal(obj, out); - - return out.toByteArray(); - } - finally { - U.close(out, null); - } - } - - /** {@inheritDoc} */ - @Override public T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException { - GridByteArrayInputStream in = null; - - try { - in = new GridByteArrayInputStream(arr, 0, arr.length); - - return unmarshal(in, clsLdr); - } - finally { - U.close(in, null); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java deleted file mode 100644 index 1656571..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java +++ /dev/null @@ -1,128 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller; - -import org.gridgain.grid.*; -import org.jetbrains.annotations.*; - -import java.io.*; - -/** - * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides - * serialization/deserialization mechanism for all instances that are sent across networks - * or are otherwise serialized. - *

- * Gridgain provides the following {@code GridMarshaller} implementations: - *

    - *
  • {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default
    • - *
  • {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}
    • - *
- *

- * Below are examples of marshaller configuration, usage, and injection into tasks, jobs, - * and SPI's. - *

Java Example

- * {@code GridMarshaller} can be explicitely configured in code. - * 
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- *
- *

Spring Example

- * GridMarshaller can be configured from Spring XML configuration file: - * 
- * <bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true">
- *     ...
- *     <property name="marshaller">
- *         <bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/>
- *     </property>
- *     ...
- * </bean>
- *
- *

- * - *
- * For information about Spring framework visit www.springframework.org - *

Injection Example

- * GridMarshaller can be injected in users task, job or SPI as following: - * 
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     @GridMarshallerResource
- *     private GridMarshaller marshaller;
- *
- *     public Serializable execute() {
- *         // Use marshaller to serialize/deserialize any object.
- *         ...
- *     }
- * }
- *
- * or - * 
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     @GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- *
- */ -public interface GridMarshaller { - /** - * Marshals object to the output stream. This method should not close - * given output stream. - * - * @param obj Object to marshal. - * @param out Output stream to marshal into. - * @throws GridException If marshalling failed. - */ - public void marshal(@Nullable Object obj, OutputStream out) throws GridException; - - /** - * Marshals object to byte array. - * - * @param obj Object to marshal. - * @return Byte array. - * @throws GridException If marshalling failed. - */ - public byte[] marshal(@Nullable Object obj) throws GridException; - - /** - * Unmarshals object from the output stream using given class loader. - * This method should not close given input stream. - * - * @param Type of unmarshalled object. - * @param in Input stream. - * @param clsLdr Class loader to use. - * @return Unmarshalled object. - * @throws GridException If unmarshalling failed. - */ - public T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException; - - /** - * Unmarshals object from byte array using given class loader. - * - * @param Type of unmarshalled object. - * @param arr Byte array. - * @param clsLdr Class loader to use. - * @return Unmarshalled object. - * @throws GridException If unmarshalling failed. - */ - public T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java deleted file mode 100644 index d9d7792..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java +++ /dev/null @@ -1,145 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.apache.ignite.marshaller; - -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.gridgain.grid.kernal.*; -import org.gridgain.grid.kernal.executor.*; -import org.gridgain.grid.util.*; -import org.gridgain.grid.util.typedef.internal.*; - -import javax.management.*; -import java.util.*; -import java.util.concurrent.*; - -/** - * Controls what classes should be excluded from marshalling by default. - */ -public final class GridMarshallerExclusions { - /** - * Classes that must be included in serialization. All marshallers must - * included these classes. - *

- * Note that this list supercedes {@link #EXCL_CLASSES}. - */ - private static final Class[] INCL_CLASSES = new Class[] { - // GridGain classes. - GridLoggerProxy.class, - GridExecutorService.class - }; - - /** */ - private static final Map, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>( - 512, 512, 0.75f, 16); - - /** - * Excluded grid classes from serialization. All marshallers must omit - * these classes. Fields of these types should be serialized as {@code null}. - *

- * Note that {@link #INCL_CLASSES} supercedes this list. - */ - private static final Class[] EXCL_CLASSES; - - /** - * - */ - static { - Class springCtxCls = null; - - try { - springCtxCls = Class.forName("org.springframework.context.ApplicationContext"); - } - catch (Exception ignored) { - // No-op. - } - - List> excl = new ArrayList<>(); - - // Non-GridGain classes. - excl.add(MBeanServer.class); - excl.add(ExecutorService.class); - excl.add(ClassLoader.class); - excl.add(Thread.class); - - if (springCtxCls != null) - excl.add(springCtxCls); - - // GridGain classes. - excl.add(IgniteLogger.class); - excl.add(ComputeTaskSession.class); - excl.add(ComputeLoadBalancer.class); - excl.add(ComputeJobContext.class); - excl.add(GridMarshaller.class); - excl.add(GridComponent.class); - excl.add(ComputeTaskContinuousMapper.class); - - EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]); - } - - /** - * Ensures singleton. - */ - private GridMarshallerExclusions() { - // No-op. - } - - /** - * Checks given class against predefined set of excluded types. - * - * @param cls Class to check. - * @return {@code true} if class should be excluded, {@code false} otherwise. - */ - @SuppressWarnings("ForLoopReplaceableByForEach") - private static boolean isExcluded0(Class cls) { - assert cls != null; - - final Class[] inc = INCL_CLASSES; - - // NOTE: don't use foreach for performance reasons. - for (int i = 0; i < inc.length; i++) - if (inc[i].isAssignableFrom(cls)) - return false; - - final Class[] exc = EXCL_CLASSES; - - // NOTE: don't use foreach for performance reasons. - for (int i = 0; i < exc.length; i++) - if (exc[i].isAssignableFrom(cls)) - return true; - - return false; - } - - /** - * Checks whether or not given class should be excluded from marshalling. - * - * @param cls Class to check. - * @return {@code true} if class should be excluded, {@code false} otherwise. - */ - public static boolean isExcluded(Class cls) { - Boolean res = cache.get(cls); - - if (res == null) { - res = isExcluded0(cls); - - cache.put(cls, res); - } - - return res; - } - - /** - * Intended for test purposes only. - */ - public static void clearCache() { - cache.clear(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java new file mode 100644 index 0000000..5002e63 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java @@ -0,0 +1,57 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.gridgain.grid.*; +import org.gridgain.grid.util.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.grid.util.io.*; +import org.jetbrains.annotations.*; + +/** + * Base class for marshallers. Provides default implementations of methods + * that work with byte array or {@link GridByteArrayList}. These implementations + * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream} + * to marshal and unmarshal objects. + */ +public abstract class IgniteAbstractMarshaller implements IgniteMarshaller { + /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */ + public static final int DFLT_BUFFER_SIZE = 512; + + /** {@inheritDoc} */ + @Override public byte[] marshal(@Nullable Object obj) throws GridException { + GridByteArrayOutputStream out = null; + + try { + out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE); + + marshal(obj, out); + + return out.toByteArray(); + } + finally { + U.close(out, null); + } + } + + /** {@inheritDoc} */ + @Override public T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException { + GridByteArrayInputStream in = null; + + try { + in = new GridByteArrayInputStream(arr, 0, arr.length); + + return unmarshal(in, clsLdr); + } + finally { + U.close(in, null); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java new file mode 100644 index 0000000..ace4c9c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java @@ -0,0 +1,128 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.gridgain.grid.*; +import org.jetbrains.annotations.*; + +import java.io.*; + +/** + * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides + * serialization/deserialization mechanism for all instances that are sent across networks + * or are otherwise serialized. + *

+ * Gridgain provides the following {@code GridMarshaller} implementations: + *

    + *
  • {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default
    • + *
  • {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}
    • + *
+ *

+ * Below are examples of marshaller configuration, usage, and injection into tasks, jobs, + * and SPI's. + *

Java Example

+ * {@code GridMarshaller} can be explicitely configured in code. + * 
+ * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ *
+ *

Spring Example

+ * GridMarshaller can be configured from Spring XML configuration file: + * 
+ * <bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true">
+ *     ...
+ *     <property name="marshaller">
+ *         <bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/>
+ *     </property>
+ *     ...
+ * </bean>
+ *
+ *

+ * + *
+ * For information about Spring framework visit www.springframework.org + *

Injection Example

+ * GridMarshaller can be injected in users task, job or SPI as following: + * 
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     @GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *
+ *     public Serializable execute() {
+ *         // Use marshaller to serialize/deserialize any object.
+ *         ...
+ *     }
+ * }
+ *
+ * or + * 
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     @GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ *
+ */ +public interface IgniteMarshaller { + /** + * Marshals object to the output stream. This method should not close + * given output stream. + * + * @param obj Object to marshal. + * @param out Output stream to marshal into. + * @throws GridException If marshalling failed. + */ + public void marshal(@Nullable Object obj, OutputStream out) throws GridException; + + /** + * Marshals object to byte array. + * + * @param obj Object to marshal. + * @return Byte array. + * @throws GridException If marshalling failed. + */ + public byte[] marshal(@Nullable Object obj) throws GridException; + + /** + * Unmarshals object from the output stream using given class loader. + * This method should not close given input stream. + * + * @param Type of unmarshalled object. + * @param in Input stream. + * @param clsLdr Class loader to use. + * @return Unmarshalled object. + * @throws GridException If unmarshalling failed. + */ + public T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException; + + /** + * Unmarshals object from byte array using given class loader. + * + * @param Type of unmarshalled object. + * @param arr Byte array. + * @param clsLdr Class loader to use. + * @return Unmarshalled object. + * @throws GridException If unmarshalling failed. + */ + public T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException; +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java new file mode 100644 index 0000000..2c0bfbf --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java @@ -0,0 +1,145 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.marshaller; + +import org.apache.ignite.*; +import org.apache.ignite.compute.*; +import org.gridgain.grid.kernal.*; +import org.gridgain.grid.kernal.executor.*; +import org.gridgain.grid.util.*; +import org.gridgain.grid.util.typedef.internal.*; + +import javax.management.*; +import java.util.*; +import java.util.concurrent.*; + +/** + * Controls what classes should be excluded from marshalling by default. + */ +public final class IgniteMarshallerExclusions { + /** + * Classes that must be included in serialization. All marshallers must + * included these classes. + *

+ * Note that this list supercedes {@link #EXCL_CLASSES}. + */ + private static final Class[] INCL_CLASSES = new Class[] { + // GridGain classes. + GridLoggerProxy.class, + GridExecutorService.class + }; + + /** */ + private static final Map, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>( + 512, 512, 0.75f, 16); + + /** + * Excluded grid classes from serialization. All marshallers must omit + * these classes. Fields of these types should be serialized as {@code null}. + *

+ * Note that {@link #INCL_CLASSES} supercedes this list. + */ + private static final Class[] EXCL_CLASSES; + + /** + * + */ + static { + Class springCtxCls = null; + + try { + springCtxCls = Class.forName("org.springframework.context.ApplicationContext"); + } + catch (Exception ignored) { + // No-op. + } + + List> excl = new ArrayList<>(); + + // Non-GridGain classes. + excl.add(MBeanServer.class); + excl.add(ExecutorService.class); + excl.add(ClassLoader.class); + excl.add(Thread.class); + + if (springCtxCls != null) + excl.add(springCtxCls); + + // GridGain classes. + excl.add(IgniteLogger.class); + excl.add(ComputeTaskSession.class); + excl.add(ComputeLoadBalancer.class); + excl.add(ComputeJobContext.class); + excl.add(IgniteMarshaller.class); + excl.add(GridComponent.class); + excl.add(ComputeTaskContinuousMapper.class); + + EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]); + } + + /** + * Ensures singleton. + */ + private IgniteMarshallerExclusions() { + // No-op. + } + + /** + * Checks given class against predefined set of excluded types. + * + * @param cls Class to check. + * @return {@code true} if class should be excluded, {@code false} otherwise. + */ + @SuppressWarnings("ForLoopReplaceableByForEach") + private static boolean isExcluded0(Class cls) { + assert cls != null; + + final Class[] inc = INCL_CLASSES; + + // NOTE: don't use foreach for performance reasons. + for (int i = 0; i < inc.length; i++) + if (inc[i].isAssignableFrom(cls)) + return false; + + final Class[] exc = EXCL_CLASSES; + + // NOTE: don't use foreach for performance reasons. + for (int i = 0; i < exc.length; i++) + if (exc[i].isAssignableFrom(cls)) + return true; + + return false; + } + + /** + * Checks whether or not given class should be excluded from marshalling. + * + * @param cls Class to check. + * @return {@code true} if class should be excluded, {@code false} otherwise. + */ + public static boolean isExcluded(Class cls) { + Boolean res = cache.get(cls); + + if (res == null) { + res = isExcluded0(cls); + + cache.put(cls, res); + } + + return res; + } + + /** + * Intended for test purposes only. + */ + public static void clearCache() { + cache.clear(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java index 4c02c3c..02dbd9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * Implementation of {@link GridMarshaller} based on JDK serialization mechanism. + * Implementation of {@link org.apache.ignite.marshaller.IgniteMarshaller} based on JDK serialization mechanism. *

*

Configuration

*

Mandatory

@@ -76,7 +76,7 @@ import java.io.*; *
* */ -public class IgniteJdkMarshaller extends GridAbstractMarshaller { +public class IgniteJdkMarshaller extends IgniteAbstractMarshaller { /** {@inheritDoc} */ @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException { assert out != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java index 7243893..6f0fe1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java @@ -30,7 +30,7 @@ class IgniteJdkMarshallerObjectOutputStream extends ObjectOutputStream { /** {@inheritDoc} */ @Nullable @Override protected Object replaceObject(Object o) throws IOException { - return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null : + return o == null || IgniteMarshallerExclusions.isExcluded(o.getClass()) ? null : o.getClass().equals(Object.class) ? new IgniteJdkMarshallerDummySerializable() : super.replaceObject(o); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java index e68d8cf..02dcd4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java @@ -200,7 +200,7 @@ class IgniteOptimizedClassDescriptor { IgniteOptimizedClassDescriptor(Class cls) throws IOException { this.cls = cls; - excluded = GridMarshallerExclusions.isExcluded(cls); + excluded = IgniteMarshallerExclusions.isExcluded(cls); T2 t = IgniteOptimizedClassResolver.writeClassData(cls); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java index bfd186a..8595bf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java @@ -22,7 +22,7 @@ import java.net.*; import java.util.*; /** - * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}, + * Optimized implementation of {@link org.apache.ignite.marshaller.IgniteMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}, * which is based on standard {@link ObjectOutputStream}, this marshaller does not * enforce that all serialized objects implement {@link Serializable} interface. It is also * about 20 times faster as it removes lots of serialization overhead that exists in @@ -91,7 +91,7 @@ import java.util.*; * } * */ -public class IgniteOptimizedMarshaller extends GridAbstractMarshaller { +public class IgniteOptimizedMarshaller extends IgniteAbstractMarshaller { /** Whether or not to require an object to be serializable in order to be marshalled. */ private boolean requireSer = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java index 0ad0732..8acaf4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java @@ -14,7 +14,7 @@ import org.gridgain.grid.spi.*; import java.lang.annotation.*; /** - * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.GridMarshaller} resource. Grid marshaller + * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.IgniteMarshaller} resource. Grid marshaller * is provided to grid via {@link org.apache.ignite.configuration.IgniteConfiguration}. *

* Marshaller can be injected into instances of following classes: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java index 2d004ae..a4ea024 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java @@ -85,7 +85,7 @@ public class GridCacheRendezvousAffinityFunction implements GridCacheAffinityFun private GridCacheAffinityNodeHashResolver hashIdRslvr = new GridCacheAffinityNodeAddressHashResolver(); /** Marshaller. */ - private GridMarshaller marshaller = new IgniteOptimizedMarshaller(false); + private IgniteMarshaller marshaller = new IgniteOptimizedMarshaller(false); /** * Empty constructor with all defaults. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java index d9df3e7..b8248c2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java @@ -138,7 +138,7 @@ public class GridCacheJdbcBlobStore extends GridCacheStoreAdapter { /** Marshaller. */ @IgniteMarshallerResource - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** Init guard. */ @GridToStringExclude http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java index c1f27de..9f65ead 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java @@ -344,7 +344,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { * @param marsh Marshaller. * @throws GridException In case of error. */ - void p2pMarshal(GridMarshaller marsh) throws GridException { + void p2pMarshal(IgniteMarshaller marsh) throws GridException { assert marsh != null; bytes = marsh.marshal(evt); @@ -355,7 +355,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { * @param ldr Class loader. * @throws GridException In case of error. */ - void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { assert marsh != null; assert evt == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 23cfdb7..7193c1c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -1458,7 +1458,7 @@ public class GridGainEx { MBeanServer mbSrv = cfg.getMBeanServer(); - GridMarshaller marsh = cfg.getMarshaller(); + IgniteMarshaller marsh = cfg.getMarshaller(); String[] p2pExclude = cfg.getPeerClassLoadingLocalClassPathExclude(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java index e91f3f4..5e90cdb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java @@ -61,7 +61,7 @@ public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter * @param marsh Marshaller. * @throws GridException In case of error. */ - public void unmarshalSiblings(GridMarshaller marsh) throws GridException { + public void unmarshalSiblings(IgniteMarshaller marsh) throws GridException { assert marsh != null; if (siblingsBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java index 9353504..6a8474a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java @@ -1980,7 +1980,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe // Clean internal class/classloader caches to avoid stopped contexts held in memory. IgniteOptimizedMarshaller.clearCache(); - GridMarshallerExclusions.clearCache(); + IgniteMarshallerExclusions.clearCache(); GridEnumCache.clear(); gw.writeLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java index 406273e..3ff9450 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java @@ -54,7 +54,7 @@ public class GridCheckpointManager extends GridManagerAdapter MAX_CLOSED_SESS, MAX_CLOSED_SESS, 0.75f, 256, PER_SEGMENT_Q); /** Grid marshaller. */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** * @param ctx Grid kernal context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java index 7cb14ec..39cb15b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java @@ -108,7 +108,7 @@ public class GridIoManager extends GridManagerAdapter commLsnr; /** Grid marshaller. */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** Busy lock. */ private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java index c7f6a14..cefc7f9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java @@ -53,7 +53,7 @@ class GridDeploymentCommunication { private final GridBusyLock busyLock = new GridBusyLock(); /** */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** * Creates new instance of deployment communication. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java index 585fbd7..5a4e389 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java @@ -57,7 +57,7 @@ public class GridEventStorageManager extends GridManagerAdapter { /** */ - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** Type descriptors. */ private final ConcurrentMap types = new ConcurrentHashMap8<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java index 2e7085c..d5deb3a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java @@ -31,7 +31,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridSwapSpaceManager extends GridManagerAdapter { /** */ - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** * @param ctx Grid kernal context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java index 85d1107..5c1492c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java @@ -642,7 +642,7 @@ public class GridCacheContext implements Externalizable { /** * @return Marshaller. */ - public GridMarshaller marshaller() { + public IgniteMarshaller marshaller() { return ctx.config().getMarshaller(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java index 66aaf5b..3fea7ce 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java @@ -234,7 +234,7 @@ public class GridCacheEntryInfo implements Externalizable { * @throws GridException If unmarshalling failed. */ public void unmarshal(GridCacheContext ctx, ClassLoader clsLdr) throws GridException { - GridMarshaller mrsh = ctx.marshaller(); + IgniteMarshaller mrsh = ctx.marshaller(); if (key == null) key = mrsh.unmarshal(keyBytes, clsLdr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java index c7bef12..94d9881 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java @@ -404,7 +404,7 @@ public abstract class GridCacheMessage extends GridTcpCommunicationMessage IgnitePredicate>[] filter = new IgnitePredicate[byteCol.length]; - GridMarshaller marsh = ctx.marshaller(); + IgniteMarshaller marsh = ctx.marshaller(); for (int i = 0; i < byteCol.length; i++) filter[i] = byteCol[i] == null ? null : @@ -457,7 +457,7 @@ public abstract class GridCacheMessage extends GridTcpCommunicationMessage List col = new ArrayList<>(byteCol.size()); - GridMarshaller marsh = ctx.marshaller(); + IgniteMarshaller marsh = ctx.marshaller(); for (GridCacheValueBytes item : byteCol) { assert item == null || item.get() != null; @@ -510,7 +510,7 @@ public abstract class GridCacheMessage extends GridTcpCommunicationMessage List col = new ArrayList<>(byteCol.size()); - GridMarshaller marsh = ctx.marshaller(); + IgniteMarshaller marsh = ctx.marshaller(); for (byte[] bytes : byteCol) col.add(bytes == null ? null : marsh.unmarshal(bytes, ldr)); @@ -561,7 +561,7 @@ public abstract class GridCacheMessage extends GridTcpCommunicationMessage LinkedHashMap map = U.newLinkedHashMap(byteMap.size()); - GridMarshaller marsh = ctx.marshaller(); + IgniteMarshaller marsh = ctx.marshaller(); for (Map.Entry e : byteMap.entrySet()) map.put(marsh.unmarshal(e.getKey(), ldr), e.getValue()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java index fd03aaa..8a2653d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java @@ -256,7 +256,7 @@ public class GridCacheSharedContext { /** * @return Marshaller. */ - public GridMarshaller marshaller() { + public IgniteMarshaller marshaller() { return kernalCtx.config().getMarshaller(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java index c584996..b53654b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -106,7 +106,7 @@ public class GridCacheLocalQueryFuture extends GridCacheQueryFutureAdap IgnitePredicate> prjPred = qry.query().projectionFilter() == null ? F.>alwaysTrue() : qry.query().projectionFilter(); - GridMarshaller marsh = cctx.marshaller(); + IgniteMarshaller marsh = cctx.marshaller(); IgniteReducer rdc = qry.reducer() != null ? marsh.>unmarshal(marsh.marshal(qry.reducer()), null) : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java index 1c5d7ba..d76b4f7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java @@ -275,7 +275,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implemen @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws GridException { super.finishUnmarshal(ctx, ldr); - GridMarshaller mrsh = ctx.marshaller(); + IgniteMarshaller mrsh = ctx.marshaller(); if (keyValFilterBytes != null) keyValFilter = mrsh.unmarshal(keyValFilterBytes, ldr); @@ -298,7 +298,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implemen * @throws GridException In case of error. */ void beforeLocalExecution(GridCacheContext ctx) throws GridException { - GridMarshaller marsh = ctx.marshaller(); + IgniteMarshaller marsh = ctx.marshaller(); rdc = rdc != null ? marsh.>unmarshal(marsh.marshal(rdc), null) : null; trans = trans != null ? marsh.>unmarshal(marsh.marshal(trans), null) : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index 33d8e82..6f83ea5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -115,7 +115,7 @@ public class GridCacheContinuousQueryEntry implements GridCacheEntry * @param ldr Class loader. * @throws GridException In case of error. */ - void initValue(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + void initValue(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { assert marsh != null; if (newVal == null && newValBytes != null && !newValBytes.isNull()) @@ -140,7 +140,7 @@ public class GridCacheContinuousQueryEntry implements GridCacheEntry * @param marsh Marshaller. * @throws GridException In case of error. */ - void p2pMarshal(GridMarshaller marsh) throws GridException { + void p2pMarshal(IgniteMarshaller marsh) throws GridException { assert marsh != null; assert key != null; @@ -161,7 +161,7 @@ public class GridCacheContinuousQueryEntry implements GridCacheEntry * @param ldr Class loader. * @throws GridException In case of error. */ - void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { assert marsh != null; assert key == null : "Key should be null: " + key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index e8c0013..b518f23 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -35,7 +35,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter map(List subgrid, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index 5f65f1d..499ac6a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -44,7 +44,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter { private static final long serialVersionUID = 0L; /** Marshaller. */ - private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller(); + private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller(); /** How long to store future (10 minutes). */ private static final int RMV_DELAY = 10 * 60; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java index cd83114..72fb0f1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java @@ -1196,7 +1196,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { if (ctx.localNodeId().equals(node.id())) { if (hadLocNode) { - GridMarshaller marsh = ctx.config().getMarshaller(); + IgniteMarshaller marsh = ctx.config().getMarshaller(); job = marsh.unmarshal(marsh.marshal(job), null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java index d6ab870..2e5b1c9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java @@ -87,7 +87,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { private long ackTimeout; /** Marshaller. */ - private GridMarshaller marsh; + private IgniteMarshaller marsh; /** * @param ctx Kernal context. @@ -1303,7 +1303,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { * @param marsh Marshaller. * @throws GridException In case of error. */ - void p2pMarshal(GridMarshaller marsh) throws GridException { + void p2pMarshal(IgniteMarshaller marsh) throws GridException { assert marsh != null; prjPredBytes = marsh.marshal(prjPred); @@ -1314,7 +1314,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { * @param ldr Class loader. * @throws GridException In case of error. */ - void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { assert marsh != null; assert prjPred == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java index 0a8d9c2..2227f72 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java @@ -48,7 +48,7 @@ public class GridDataLoaderProcessor extends GridProcessorAdapter { private final DelayQueue> flushQ = new DelayQueue<>(); /** Marshaller. */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** * @param ctx Kernal context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java index 83a1824..3f0d7ba 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java @@ -121,7 +121,7 @@ public class GridRawVersionedEntry implements GridVersionedEntry, Ex } /** {@inheritDoc} */ - @Override public void unmarshal(GridMarshaller marsh) throws GridException { + @Override public void unmarshal(IgniteMarshaller marsh) throws GridException { unmarshalKey(marsh); if (valBytes != null && val == null) @@ -135,13 +135,13 @@ public class GridRawVersionedEntry implements GridVersionedEntry, Ex * @param marsh Marshaller. * @throws GridException If failed. */ - private void unmarshalKey(GridMarshaller marsh) throws GridException { + private void unmarshalKey(IgniteMarshaller marsh) throws GridException { if (key == null) key = marsh.unmarshal(keyBytes, null); } /** {@inheritDoc} */ - @Override public void marshal(GridMarshaller marsh) throws GridException { + @Override public void marshal(IgniteMarshaller marsh) throws GridException { if (keyBytes == null) keyBytes = marsh.marshal(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java index 8a04583..90a7fe5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java @@ -59,7 +59,7 @@ public interface GridVersionedEntry extends Map.Entry { * @param marsh Marshaller. * @throws GridException If failed. */ - public void marshal(GridMarshaller marsh) throws GridException; + public void marshal(IgniteMarshaller marsh) throws GridException; /** * Perform internal unmarshal of this entry. It must be performed after entry is deserialized and before @@ -68,5 +68,5 @@ public interface GridVersionedEntry extends Map.Entry { * @param marsh Marshaller. * @throws GridException If failed. */ - public void unmarshal(GridMarshaller marsh) throws GridException; + public void unmarshal(IgniteMarshaller marsh) throws GridException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java index ff92b80..29b6e3d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java @@ -79,7 +79,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void prepareMarshal(GridMarshaller marsh) throws GridException { + @Override public void prepareMarshal(IgniteMarshaller marsh) throws GridException { super.prepareMarshal(marsh); if (err != null) @@ -87,7 +87,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { super.finishUnmarshal(marsh, ldr); if (errBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java index 0c9ad31..ce88052 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java @@ -31,7 +31,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM * @param marsh Marshaller. * @throws GridException In case of error. */ - public void prepareMarshal(GridMarshaller marsh) throws GridException { + public void prepareMarshal(IgniteMarshaller marsh) throws GridException { // No-op. } @@ -40,7 +40,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM * @param ldr Class loader. * @throws GridException In case of error. */ - public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java index 7813fe5..82150f3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java @@ -83,7 +83,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void prepareMarshal(GridMarshaller marsh) throws GridException { + @Override public void prepareMarshal(IgniteMarshaller marsh) throws GridException { super.prepareMarshal(marsh); if (err != null) @@ -91,7 +91,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException { super.finishUnmarshal(marsh, ldr); if (errBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java index b5589e1..a6914d7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java @@ -54,7 +54,7 @@ public class GridJobProcessor extends GridProcessorAdapter { public static final GridProductVersion SUBJECT_ID_ADDED_SINCE_VER = GridProductVersion.fromString("6.2.1"); /** */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** */ private final boolean jobAlwaysActivate; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java index b18294e..c90e959 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java @@ -79,7 +79,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { private final IgniteLogger log; /** */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** */ private final GridJobSessionImpl ses; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java index cd5a31c..11d0ca8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java @@ -31,7 +31,7 @@ public class GridOffHeapProcessor extends GridProcessorAdapter { new ConcurrentHashMap8<>(); /** */ - private final GridMarshaller marsh; + private final IgniteMarshaller marsh; /** * @param ctx Kernal context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java index 9ac4f99..5805a48 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java @@ -62,7 +62,7 @@ class GridResourceCustomInjector implements GridResourceInjector { private GridResourceBasicInjector nodeIdInjector; /** Marshaller injector. */ - private GridResourceBasicInjector marshallerInjector; + private GridResourceBasicInjector marshallerInjector; /** Spring application context injector. */ private GridResourceInjector springCtxInjector; @@ -158,7 +158,7 @@ class GridResourceCustomInjector implements GridResourceInjector { * * @param marshallerInjector Grid marshaller. */ - public void setMarshallerInjector(GridResourceBasicInjector marshallerInjector) { + public void setMarshallerInjector(GridResourceBasicInjector marshallerInjector) { this.marshallerInjector = marshallerInjector; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java index 8463fe7..f2dbbde 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java @@ -90,7 +90,7 @@ public class GridResourceProcessor extends GridProcessorAdapter { private GridResourceBasicInjector execInjector; /** Grid marshaller injector. */ - private GridResourceBasicInjector marshInjector; + private GridResourceBasicInjector marshInjector; /** Local node ID injector. */ private GridResourceBasicInjector nodeIdInjector; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java index 1bcf300..32d00a3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java @@ -49,7 +49,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap * @param jdkMarshaller JDK marshaller. * @throws GridException If failed to marshal. */ - public GridMemcachedMessageWrapper(GridMemcachedMessage msg, GridMarshaller jdkMarshaller) throws GridException { + public GridMemcachedMessageWrapper(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws GridException { bytes = encodeMemcache(msg, jdkMarshaller); } @@ -111,7 +111,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap * @return Serialized message. * @throws org.gridgain.grid.GridException If serialization failed. */ - private byte[] encodeMemcache(GridMemcachedMessage msg, GridMarshaller jdkMarshaller) throws GridException { + private byte[] encodeMemcache(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws GridException { GridByteArrayList res = new GridByteArrayList(HDR_LEN - 1); int keyLen = 0; @@ -195,7 +195,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap * @return Serialization flags. * @throws GridException If JDK serialization failed. */ - private int encodeObj(Object obj, ByteArrayOutputStream out, GridMarshaller jdkMarshaller) throws GridException { + private int encodeObj(Object obj, ByteArrayOutputStream out, IgniteMarshaller jdkMarshaller) throws GridException { int flags = 0; byte[] data = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java index abcc72e..3c2c8a0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java @@ -42,7 +42,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter srv; /** JDK marshaller. */ - private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller(); + private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller(); /** NIO server listener. */ private GridTcpRestNioListener lsnr; @@ -110,7 +110,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { /** * @return JDK marshaller. */ - GridMarshaller jdkMarshaller() { + IgniteMarshaller jdkMarshaller() { return jdkMarshaller; }