ignite-6644 Cache store marshalling improvements
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f81a7b1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f81a7b1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f81a7b1 Branch: refs/heads/ignite-6644 Commit: 1f81a7b15a67dec4811832f78cb15dd76d2778ae Parents: b98a003 Author: Andrey Gura <[email protected]> Authored: Tue Jan 23 21:32:34 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Wed Jan 24 18:01:59 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContext.java | 6 ---- .../ignite/internal/GridKernalContextImpl.java | 11 +------ .../ignite/internal/MarshallerContextImpl.java | 25 ++++++++++++++-- .../GridClientOptimizedMarshaller.java | 4 +-- .../optimized/OptimizedMarshallerUtils.java | 4 --- .../optimized/OptimizedObjectInputStream.java | 5 ++-- .../optimized/OptimizedObjectOutputStream.java | 3 +- .../wal/reader/StandaloneGridKernalContext.java | 8 +---- .../platform/utils/PlatformUtils.java | 2 +- .../rest/protocols/tcp/GridTcpRestParser.java | 15 ++++++++-- .../rest/protocols/tcp/GridTcpRestProtocol.java | 31 +------------------- .../ignite/marshaller/MarshallerContext.java | 14 +++++++++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../ignite/stream/socket/SocketStreamer.java | 2 +- .../MarshallerContextLockingSelfTest.java | 2 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 12 ++++++++ .../cache/GridCacheEntryMemorySizeSelfTest.java | 11 ++++++- .../marshaller/MarshallerContextSelfTest.java | 10 +++---- .../marshaller/MarshallerContextTestImpl.java | 2 +- .../junits/GridTestKernalContext.java | 6 ---- 20 files changed, 89 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index 2877dad..ce12b61 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -69,7 +69,6 @@ import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions; import org.apache.ignite.internal.util.IgniteExceptionRegistry; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.PluginNotFoundException; import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.thread.IgniteStripedThreadPoolExecutor; @@ -656,9 +655,4 @@ public interface GridKernalContext extends Iterable<GridComponent> { * @return subscription processor to manage internal-only (strict node-local) subscriptions between components. */ public GridInternalSubscriptionProcessor internalSubscriptionProcessor(); - - /** - * @return class name filter for marshaller. - */ - public IgnitePredicate<String> classNameFilter(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 61d0dd1..4e8f78f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -386,9 +386,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** */ private GridInternalSubscriptionProcessor internalSubscriptionProc; - /** Class name filter. */ - private IgnitePredicate<String> clsFilter; - /** * No-arg constructor is required by externalization. */ @@ -468,9 +465,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable this.qryExecSvc = qryExecSvc; this.schemaExecSvc = schemaExecSvc; this.customExecSvcs = customExecSvcs; - this.clsFilter = clsFilter; - marshCtx = new MarshallerContextImpl(plugins); + marshCtx = new MarshallerContextImpl(plugins, clsFilter); try { spring = SPRING.create(false); @@ -1098,11 +1094,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable } /** {@inheritDoc} */ - @Override public IgnitePredicate<String> classNameFilter() { - return clsFilter; - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridKernalContextImpl.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index 8b0dc4f..d82ab17 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -50,7 +50,9 @@ import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -85,6 +87,12 @@ public class MarshallerContextImpl implements MarshallerContext { /** */ private boolean clientNode; + /** Class name filter. */ + private final IgnitePredicate<String> clsFilter; + + /** JDK marshaller. */ + private final JdkMarshaller jdkMarsh; + /** * Marshaller mapping file store directory. {@code null} used for standard folder, in this case folder is calculated * from work directory. Non null value may be used to setup custom directory from outside @@ -96,7 +104,10 @@ public class MarshallerContextImpl implements MarshallerContext { * * @param plugins Plugins. */ - public MarshallerContextImpl(@Nullable Collection<PluginProvider> plugins) { + public MarshallerContextImpl(@Nullable Collection<PluginProvider> plugins, IgnitePredicate<String> clsFilter) { + this.clsFilter = clsFilter; + this.jdkMarsh = new JdkMarshaller(clsFilter); + initializeCaches(); try { @@ -326,7 +337,7 @@ public class MarshallerContextImpl implements MarshallerContext { if (clsName == null) throw new ClassNotFoundException("Unknown type ID: " + typeId); - return U.forName(clsName, ldr); + return U.forName(clsName, ldr, clsFilter); } /** {@inheritDoc} */ @@ -381,6 +392,16 @@ public class MarshallerContextImpl implements MarshallerContext { return clsName; } + /** {@inheritDoc} */ + @Override public IgnitePredicate<String> classNameFilter() { + return clsFilter; + } + + /** {@inheritDoc} */ + @Override public JdkMarshaller jdkMarshaller() { + return jdkMarsh; + } + /** * @param platformId Platform id. * @param typeId Type id. http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/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 257b34c..2af1841 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 @@ -117,14 +117,14 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { private static class ClientMarshallerContext extends MarshallerContextImpl { /** */ public ClientMarshallerContext() { - super(null); + super(null, null); } /** * @param plugins Plugins. */ public ClientMarshallerContext(@Nullable List<PluginProvider> plugins) { - super(plugins); + super(plugins, null); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java index f9a6df9..aa4bfd6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerUtils.java @@ -33,7 +33,6 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.marshaller.MarshallerContext; -import org.apache.ignite.marshaller.jdk.JdkMarshaller; import static org.apache.ignite.internal.MarshallerPlatformIds.JAVA_ID; @@ -152,9 +151,6 @@ class OptimizedMarshallerUtils { /** UTF-8 character name. */ static final Charset UTF_8 = Charset.forName("UTF-8"); - /** JDK marshaller. */ - static final JdkMarshaller JDK_MARSH = new JdkMarshaller(); - static { long mapOff; http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java index 93a6f6f..0bd7cc0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java @@ -70,7 +70,6 @@ import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshalle import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.INT; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.INT_ARR; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.JDK; -import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_MAP; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.LINKED_HASH_SET; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.LINKED_LIST; @@ -227,7 +226,7 @@ class OptimizedObjectInputStream extends ObjectInputStream { case JDK: try { - return JDK_MARSH.unmarshal(this, clsLdr); + return ctx.jdkMarshaller().unmarshal(this, clsLdr); } catch (IgniteCheckedException e) { IOException ioEx = e.getCause(IOException.class); @@ -338,7 +337,7 @@ class OptimizedObjectInputStream extends ObjectInputStream { int typeId = readInt(); OptimizedClassDescriptor desc = typeId == 0 ? - classDescriptor(clsMap, U.forName(readUTF(), clsLdr), ctx, mapper): + classDescriptor(clsMap, U.forName(readUTF(), clsLdr, ctx.classNameFilter()), ctx, mapper): classDescriptor(clsMap, typeId, clsLdr, ctx, mapper); curCls = desc.describedClass(); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java index 092d6a4..8a323a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectOutputStream.java @@ -47,7 +47,6 @@ import org.apache.ignite.marshaller.MarshallerContext; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.HANDLE; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.JDK; -import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.JDK_MARSH; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.NULL; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.classDescriptor; import static org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerUtils.getBoolean; @@ -185,7 +184,7 @@ class OptimizedObjectOutputStream extends ObjectOutputStream { writeByte(JDK); try { - JDK_MARSH.marshal(obj, this); + ctx.jdkMarshaller().marshal(obj, this); } catch (IgniteCheckedException e) { IOException ioEx = e.getCause(IOException.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java index 92a6e6d..44a75c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java @@ -84,7 +84,6 @@ import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions; import org.apache.ignite.internal.util.IgniteExceptionRegistry; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.plugin.PluginNotFoundException; import org.apache.ignite.plugin.PluginProvider; @@ -138,7 +137,7 @@ public class StandaloneGridKernalContext implements GridKernalContext { throw new IllegalStateException("Must not fail on empty providers list.", e); } - this.marshallerCtx = new MarshallerContextImpl(null); + this.marshallerCtx = new MarshallerContextImpl(null, null); this.cfg = prepareIgniteConfiguration(); // Fake folder provided to perform processor startup on empty folder. @@ -629,9 +628,4 @@ public class StandaloneGridKernalContext implements GridKernalContext { @NotNull @Override public Iterator<GridComponent> iterator() { return null; } - - /** {@inheritDoc} */ - @Override public IgnitePredicate<String> classNameFilter() { - return null; - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index 2954a9e..12f70dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -857,7 +857,7 @@ public class PlatformUtils { BinaryMarshaller marsh = new BinaryMarshaller(); - marsh.setContext(new MarshallerContextImpl(null)); + marsh.setContext(new MarshallerContextImpl(null, null)); ctx.configure(marsh, new IgniteConfiguration()); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index b4c8b7c..65eb3c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -72,7 +72,7 @@ public class GridTcpRestParser implements GridNioParser { private static final Charset UTF_8 = Charset.forName("UTF-8"); /** JDK marshaller. */ - private final Marshaller jdkMarshaller = new JdkMarshaller(); + private final Marshaller marsh; /** Router client flag. */ private final boolean routerClient; @@ -81,7 +81,16 @@ public class GridTcpRestParser implements GridNioParser { * @param routerClient Router client flag. */ public GridTcpRestParser(boolean routerClient) { + this(routerClient, new JdkMarshaller()); + } + + /** + * @param routerClient Router client flag. + * @param marsh Marshaller. + */ + public GridTcpRestParser(boolean routerClient, Marshaller marsh) { this.routerClient = routerClient; + this.marsh = marsh; } /** {@inheritDoc} */ @@ -735,7 +744,7 @@ public class GridTcpRestParser implements GridNioParser { assert bytes != null; if ((flags & SERIALIZED_FLAG) != 0) - return U.unmarshal(jdkMarshaller, bytes, null); + return U.unmarshal(marsh, bytes, null); int masked = flags & 0xff00; @@ -817,7 +826,7 @@ public class GridTcpRestParser implements GridNioParser { flags |= BYTE_ARR_FLAG; } else { - U.marshal(jdkMarshaller, obj, out); + U.marshal(marsh, obj, out); flags |= SERIALIZED_FLAG; } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index df0e569..0049dbc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -44,17 +44,12 @@ import org.apache.ignite.internal.util.nio.GridNioFilter; import org.apache.ignite.internal.util.nio.GridNioParser; import org.apache.ignite.internal.util.nio.GridNioServer; import org.apache.ignite.internal.util.nio.GridNioServerListener; -import org.apache.ignite.internal.util.nio.GridNioSession; import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.spi.IgnitePortProtocol; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.MARSHALLER; - /** * TCP binary protocol implementation. */ @@ -62,9 +57,6 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { /** Server. */ private GridNioServer<GridClientMessage> srv; - /** JDK marshaller. */ - private final Marshaller jdkMarshaller = new JdkMarshaller(); - /** NIO server listener. */ private GridTcpRestNioListener lsnr; @@ -73,27 +65,6 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { super(ctx); } - /** - * @return JDK marshaller. - */ - Marshaller jdkMarshaller() { - return jdkMarshaller; - } - - /** - * Returns marshaller. - * - * @param ses Session. - * @return Marshaller. - */ - GridClientMarshaller marshaller(GridNioSession ses) { - GridClientMarshaller marsh = ses.meta(MARSHALLER.ordinal()); - - assert marsh != null; - - return marsh; - } - /** {@inheritDoc} */ @Override public String name() { return "TCP binary"; @@ -110,7 +81,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { lsnr = new GridTcpRestNioListener(log, this, hnd, ctx); - GridNioParser parser = new GridTcpRestParser(false); + GridNioParser parser = new GridTcpRestParser(false, ctx.marshallerContext().jdkMarshaller()); try { host = resolveRestTcpHost(ctx.config()); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java index 8d6cd77..987e999 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerContext.java @@ -18,6 +18,8 @@ package org.apache.ignite.marshaller; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; /** * Marshaller context. @@ -83,4 +85,16 @@ public interface MarshallerContext { * @return {@code true} if the type is a system one, {@code false} otherwise. */ public boolean isSystemType(String typeName); + + /** + * Returns class name filter. + * + * @return Class name filter. + */ + public IgnitePredicate<String> classNameFilter(); + + /** + * Returns JDK marshaller instance. + */ + public JdkMarshaller jdkMarshaller(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 34b8fdf..51c5adf 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -554,7 +554,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi { setAddressResolver(ignite.configuration().getAddressResolver()); if (ignite instanceof IgniteKernal) // IgniteMock instance can be injected from tests. - marsh = new JdkMarshaller(((IgniteKernal)ignite).context().classNameFilter()); + marsh = ((IgniteKernal)ignite).context().marshallerContext().jdkMarshaller(); else marsh = new JdkMarshaller(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java index 827c8d0..1a68206 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java @@ -229,7 +229,7 @@ public class SocketStreamer<T, K, V> extends StreamAdapter<T, K, V> { * @param igniteInstanceName Ignite instance name. */ private DefaultConverter(@Nullable String igniteInstanceName) { - marsh = new JdkMarshaller(((IgniteKernal)ignite).context().classNameFilter()); + marsh = new JdkMarshaller(((IgniteKernal)ignite).context().marshallerContext().classNameFilter()); MarshallerUtils.setNodeName(marsh, igniteInstanceName); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java index 522b941..f31a56d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java @@ -140,7 +140,7 @@ public class MarshallerContextLockingSelfTest extends GridCommonAbstractTest { public void executeTest(GridTestLog4jLogger log, GridKernalContext ctx) throws Exception { counter.incrementAndGet(); - MarshallerContextImpl marshallerContext = new MarshallerContextImpl(null); + MarshallerContextImpl marshallerContext = new MarshallerContextImpl(null, null); marshallerContext.onMarshallerProcessorStarted(ctx, null); MarshallerMappingItem item = new MarshallerMappingItem(JAVA_ID, 1, String.class.getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java index 35aa9b9..bb7c65d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java @@ -29,8 +29,10 @@ import org.apache.ignite.binary.BinaryWriter; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.logger.NullLogger; import org.apache.ignite.marshaller.MarshallerContext; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -122,6 +124,16 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT @Override public boolean isSystemType(String typeName) { return false; } + + /** {@inheritDoc} */ + @Override public IgnitePredicate<String> classNameFilter() { + return null; + } + + /** {@inheritDoc} */ + @Override public JdkMarshaller jdkMarshaller() { + return new JdkMarshaller(); + } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index f18afb2..8092d9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -31,9 +31,10 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContext; -import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -166,6 +167,14 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { @Override public boolean isSystemType(String typeName) { return false; } + + @Override public IgnitePredicate<String> classNameFilter() { + return null; + } + + @Override public JdkMarshaller jdkMarshaller() { + return new JdkMarshaller(); + } }); return marsh; http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java index 9df56ec..da474df 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java @@ -72,7 +72,7 @@ public class MarshallerContextSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClassName() throws Exception { - MarshallerContextImpl marshCtx = new MarshallerContextImpl(null); + MarshallerContextImpl marshCtx = new MarshallerContextImpl(null, null); marshCtx.onMarshallerProcessorStarted(ctx, null); @@ -99,7 +99,7 @@ public class MarshallerContextSelfTest extends GridCommonAbstractTest { public void testMultiplatformMappingsCollecting() throws Exception { String nonJavaClassName = "random.platform.Mapping"; - MarshallerContextImpl marshCtx = new MarshallerContextImpl(null); + MarshallerContextImpl marshCtx = new MarshallerContextImpl(null, null); marshCtx.onMarshallerProcessorStarted(ctx, null); @@ -157,7 +157,7 @@ public class MarshallerContextSelfTest extends GridCommonAbstractTest { */ public void testOnUpdated() throws Exception { File workDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), "marshaller", false); - MarshallerContextImpl ctx = new MarshallerContextImpl(null); + MarshallerContextImpl ctx = new MarshallerContextImpl(null, null); ctx.onMarshallerProcessorStarted(this.ctx, null); @@ -188,7 +188,7 @@ public class MarshallerContextSelfTest extends GridCommonAbstractTest { * if platform ids passed to marshaller cache were not sequential (like 0, 2). */ public void testCacheStructure0() throws Exception { - MarshallerContextImpl ctx = new MarshallerContextImpl(null); + MarshallerContextImpl ctx = new MarshallerContextImpl(null, null); ctx.onMarshallerProcessorStarted(this.ctx, null); @@ -221,7 +221,7 @@ public class MarshallerContextSelfTest extends GridCommonAbstractTest { * if platform ids passed to marshaller context were sequential. */ public void testCacheStructure1() throws Exception { - MarshallerContextImpl ctx = new MarshallerContextImpl(null); + MarshallerContextImpl ctx = new MarshallerContextImpl(null, null); ctx.onMarshallerProcessorStarted(this.ctx, null); http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java index 0a59bba..2d6383c 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java @@ -43,7 +43,7 @@ public class MarshallerContextTestImpl extends MarshallerContextImpl { * @param excluded Excluded classes. */ public MarshallerContextTestImpl(@Nullable List<PluginProvider> plugins, Collection<String> excluded) { - super(plugins); + super(plugins, null); this.excluded = excluded; } http://git-wip-us.apache.org/repos/asf/ignite/blob/1f81a7b1/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java index cfc0abe..5b85385 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.testframework.GridTestUtils; @@ -134,11 +133,6 @@ public class GridTestKernalContext extends GridKernalContextImpl { } /** {@inheritDoc} */ - @Override public IgnitePredicate<String> classNameFilter() { - return super.classNameFilter(); - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridTestKernalContext.class, this, super.toString()); }
