Repository: incubator-ignite Updated Branches: refs/heads/ignite-141 6653e55e5 -> 9a9a2ad3c
IGNITE-141 - Marshallers refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a9a2ad3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a9a2ad3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a9a2ad3 Branch: refs/heads/ignite-141 Commit: 9a9a2ad3ce169eeb8cfad0ba420836667abc21ec Parents: 6653e55 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Feb 27 22:19:21 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Feb 27 22:19:21 2015 -0800 ---------------------------------------------------------------------- .../client/GridClientConfiguration.java | 3 +- .../ignite/internal/GridAffinitySelfTest.java | 3 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 10 ++++++ .../marshaller/MarshallerContextTestImpl.java | 38 ++++++++++++++++++++ .../OptimizedObjectStreamSelfTest.java | 18 +--------- .../junits/IgniteTestResources.java | 2 ++ .../GridHadoopClientProtocolProvider.java | 6 ++-- .../processors/query/h2/IgniteH2Indexing.java | 4 +-- .../GridSpringBeanSerializationSelfTest.java | 2 ++ 9 files changed, 62 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java index cfd780c..9aaad8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.client; import org.apache.ignite.internal.client.balancer.*; import org.apache.ignite.internal.client.marshaller.*; +import org.apache.ignite.internal.client.marshaller.jdk.*; import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.client.ssl.*; import org.apache.ignite.internal.util.typedef.*; @@ -110,7 +111,7 @@ public class GridClientConfiguration { private ExecutorService executor; /** Marshaller. */ - private GridClientMarshaller marshaller = new GridClientOptimizedMarshaller(); + private GridClientMarshaller marshaller = new GridClientJdkMarshaller(); /** Daemon flag. */ private boolean daemon; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java index d57c7b1..72bd65d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java @@ -110,7 +110,8 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { private Collection<CacheConfiguration> caches(Ignite g) { return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<CacheConfiguration>() { @Override public boolean apply(CacheConfiguration c) { - return !CU.UTILITY_CACHE_NAME.equals(c.getName()) && !CU.ATOMICS_CACHE_NAME.equals(c.getName()); + return !CU.MARSH_CACHE_NAME.equals(c.getName()) && !CU.UTILITY_CACHE_NAME.equals(c.getName()) && + !CU.ATOMICS_CACHE_NAME.equals(c.getName()); } }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/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 777c2ab..1f5e93d 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 @@ -84,6 +84,16 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { Marshaller marsh = new OptimizedMarshaller(); + marsh.setContext(new MarshallerContext() { + @Override public void registerClass(int id, String clsName) { + // No-op. + } + + @Override public String className(int id) { + throw new UnsupportedOperationException(); + } + }); + KEY_SIZE = marsh.marshal(1).length; ONE_KB_VAL_SIZE = marsh.marshal(new Value(new byte[1024])).length; TWO_KB_VAL_SIZE = marsh.marshal(new Value(new byte[2048])).length; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/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 new file mode 100644 index 0000000..21cd1b6 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.marshaller; + +import java.util.*; + +/** + * Test marshaller context. + */ +public class MarshallerContextTestImpl implements MarshallerContext { + /** */ + private final Map<Integer, String> map = new HashMap<>(); + + /** {@inheritDoc} */ + @Override public void registerClass(int id, String clsName) { + map.put(id, clsName); + } + + /** {@inheritDoc} */ + @Override public String className(int id) { + return map.get(id); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java index 3d8ea96..d42114f 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java @@ -40,7 +40,7 @@ import static org.junit.Assert.*; */ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { /** */ - private static final MarshallerContext CTX = new MarshallerContextImpl(); + private static final MarshallerContext CTX = new MarshallerContextTestImpl(); /** * @throws Exception If failed. @@ -1053,22 +1053,6 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { } /** */ - private static class MarshallerContextImpl implements MarshallerContext { - /** */ - private final Map<Integer, String> map = new HashMap<>(); - - /** {@inheritDoc} */ - @Override public void registerClass(int id, String clsName) { - map.put(id, clsName); - } - - /** {@inheritDoc} */ - @Override public String className(int id) { - return map.get(id); - } - } - - /** */ private static class IncorrectExternalizable implements Externalizable { /** * Required by {@link Externalizable}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 45921f4..acd8c40 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -250,6 +250,8 @@ public class IgniteTestResources { } } + marshaller.setContext(new MarshallerContextTestImpl()); + return marshaller; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java index a9a1c9d..56db8b8 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java @@ -23,7 +23,7 @@ import org.apache.hadoop.mapreduce.protocol.*; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.marshaller.optimized.*; +import org.apache.ignite.internal.client.marshaller.jdk.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.typedef.*; @@ -32,8 +32,8 @@ import java.net.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.client.hadoop.GridHadoopClientProtocol.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; /** @@ -110,7 +110,7 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { cliCfg.setProtocol(TCP); cliCfg.setServers(Collections.singletonList(addr)); - cliCfg.setMarshaller(new GridClientOptimizedMarshaller()); + cliCfg.setMarshaller(new GridClientJdkMarshaller()); cliCfg.setDaemon(true); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index e3da0b7..f215231 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -36,7 +36,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.marshaller.jdk.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; @@ -1112,7 +1112,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { log.debug("Starting cache query index..."); if (ctx == null) // This is allowed in some tests. - marshaller = new OptimizedMarshaller(); + marshaller = new JdkMarshaller(); else { this.ctx = ctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a9a2ad3/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java index 48ecf9b..73ba23b 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java @@ -45,6 +45,8 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { + MARSHALLER.setContext(new MarshallerContextTestImpl()); + bean = new IgniteSpringBean(); bean.setConfiguration(config());
