Make binary marshaller default WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ea000aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ea000aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ea000aa Branch: refs/heads/ignite-1282 Commit: 7ea000aa0ad4a93dac7b6e7c6e15f4c928039556 Parents: 171bbee Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 23 15:05:13 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 23 15:05:13 2015 +0300 ---------------------------------------------------------------------- .../config/binary/example-ignite-binary.xml | 44 ------ .../binary/ExampleBinaryNodeStartup.java | 36 ----- ...ComputeClientBinaryTaskExecutionExample.java | 6 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 6 +- .../java/org/apache/ignite/IgniteBinary.java | 11 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../apache/ignite/binary/BinaryIdMapper.java | 3 +- .../apache/ignite/binary/BinarySerializer.java | 2 +- .../configuration/CacheConfiguration.java | 27 ++++ .../apache/ignite/internal/IgniteKernal.java | 2 +- .../internal/portable/BinaryMarshaller.java | 144 ++++++++++++++++++ .../portable/PortableClassDescriptor.java | 2 +- .../internal/portable/PortableContext.java | 1 - .../processors/cache/GridCacheProcessor.java | 2 +- .../CacheObjectBinaryProcessorImpl.java | 2 +- .../cache/store/CacheOsStoreManager.java | 2 +- .../cpp/PlatformCppConfigurationClosure.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 2 +- .../marshaller/portable/BinaryMarshaller.java | 146 ------------------- .../portable/BinaryFieldsAbstractSelfTest.java | 1 - .../portable/BinaryFieldsHeapSelfTest.java | 2 - .../portable/BinaryFieldsOffheapSelfTest.java | 1 - .../BinaryFooterOffsetsAbstractSelfTest.java | 1 - .../BinaryFooterOffsetsHeapSelfTest.java | 2 - .../BinaryFooterOffsetsOffheapSelfTest.java | 1 - .../portable/BinaryMarshallerSelfTest.java | 1 - .../BinaryObjectBuilderAdditionalSelfTest.java | 1 - .../portable/BinaryObjectBuilderSelfTest.java | 1 - .../GridPortableAffinityKeySelfTest.java | 1 - ...idPortableMarshallerCtxDisabledSelfTest.java | 1 - .../portable/GridPortableMetaDataSelfTest.java | 1 - .../portable/GridPortableWildcardsSelfTest.java | 1 - ...IgniteCacheAbstractExecutionContextTest.java | 2 +- ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 2 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 2 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- .../GridCachePortableStoreAbstractSelfTest.java | 2 +- ...ridPortableCacheEntryMemorySizeSelfTest.java | 2 +- ...leDuplicateIndexObjectsAbstractSelfTest.java | 2 +- .../DataStreamProcessorPortableSelfTest.java | 2 +- .../GridDataStreamerImplSelfTest.java | 2 +- ...ridCacheAffinityRoutingPortableSelfTest.java | 2 +- .../GridCacheMemoryModePortableSelfTest.java | 2 +- ...acheOffHeapTieredAtomicPortableSelfTest.java | 2 +- ...eapTieredEvictionAtomicPortableSelfTest.java | 2 +- ...heOffHeapTieredEvictionPortableSelfTest.java | 2 +- .../GridCacheOffHeapTieredPortableSelfTest.java | 2 +- ...sNearPartitionedByteArrayValuesSelfTest.java | 2 +- ...sPartitionedOnlyByteArrayValuesSelfTest.java | 2 +- .../IgnitePortableCacheFullApiTestSuite.java | 2 +- .../IgnitePortableCacheTestSuite.java | 2 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 - .../IgnitePortableCacheQueryTestSuite.java | 2 +- .../Config/Compute/compute-grid1.xml | 5 - .../Config/marshaller-explicit.xml | 2 +- 58 files changed, 219 insertions(+), 298 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/examples/config/binary/example-ignite-binary.xml ---------------------------------------------------------------------- diff --git a/examples/config/binary/example-ignite-binary.xml b/examples/config/binary/example-ignite-binary.xml deleted file mode 100644 index dbec5e9..0000000 --- a/examples/config/binary/example-ignite-binary.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - 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. ---> - -<!-- - Ignite configuration with all defaults and enabled p2p deployment, events and portable marshaller. - - Use this configuration file when running HTTP REST examples (see 'examples/rest' folder). - - When starting a standalone node, you need to execute the following command: - {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/portable/example-ignite-portable.xml - - When starting Ignite from Java IDE, pass path to this file to Ignition: - Ignition.start("examples/config/portable/example-ignite-portable.xml"); ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <!-- Imports default Ignite configuration --> - <import resource="../example-default.xml"/> - - <bean parent="ignite.cfg"> - <!-- Enables portable marshaller --> - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.portable.BinaryMarshaller"/> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/examples/src/main/java/org/apache/ignite/examples/binary/ExampleBinaryNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/ExampleBinaryNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/binary/ExampleBinaryNodeStartup.java deleted file mode 100644 index 30a015b..0000000 --- a/examples/src/main/java/org/apache/ignite/examples/binary/ExampleBinaryNodeStartup.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.examples.binary; - -import org.apache.ignite.IgniteException; -import org.apache.ignite.Ignition; - -/** - * Starts up an empty node with example configuration and binary marshaller enabled. - */ -public class ExampleBinaryNodeStartup { - /** - * Start up an empty node with example configuration and binary marshaller enabled. - * - * @param args Command line arguments, none required. - * @throws IgniteException If failed. - */ - public static void main(String[] args) throws IgniteException { - Ignition.start("examples/config/binary/example-ignite-binary.xml"); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java index ae5d169..ba1c968 100644 --- a/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/binary/computegrid/ComputeClientBinaryTaskExecutionExample.java @@ -37,8 +37,8 @@ import org.apache.ignite.binary.BinaryObject; * Remote nodes should always be started with special configuration file which * enables the binary marshaller: {@code 'ignite.{sh|bat} examples/config/binary/example-ignite-binary.xml'}. * <p> - * Alternatively you can run {@link org.apache.ignite.examples.binary.ExampleBinaryNodeStartup} in another JVM which will - * start node with {@code examples/config/binary/example-ignite-binary.xml} configuration. + * Alternatively you can run {@link org.apache.ignite.examples.ExampleNodeStartup} in another JVM which will + * start a node with {@code examples/config/example-ignite.xml} configuration. */ public class ComputeClientBinaryTaskExecutionExample { /** @@ -47,7 +47,7 @@ public class ComputeClientBinaryTaskExecutionExample { * @param args Command line arguments, none required. */ public static void main(String[] args) { - try (Ignite ignite = Ignition.start("examples/config/binary/example-ignite-binary.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Binary objects task execution example started."); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java index bb88ee0..e49c16a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryPutGetExample.java @@ -44,8 +44,8 @@ import org.apache.ignite.binary.BinaryObject; * Remote nodes should always be started with special configuration file which * enables the binary marshaller: {@code 'ignite.{sh|bat} examples/config/binary/example-ignite-binary.xml'}. * <p> - * Alternatively you can run {@link org.apache.ignite.examples.binary.ExampleBinaryNodeStartup} in another JVM which will - * start node with {@code examples/config/binary/example-ignite-binary.xml} configuration. + * Alternatively you can run {@link org.apache.ignite.examples.ExampleNodeStartup} in another JVM which will + * start node with {@code examples/config/example-ignite.xml} configuration. */ @SuppressWarnings("TypeMayBeWeakened") public class CacheClientBinaryPutGetExample { @@ -58,7 +58,7 @@ public class CacheClientBinaryPutGetExample { * @param args Command line arguments, none required. */ public static void main(String[] args) { - try (Ignite ignite = Ignition.start("examples/config/binary/example-ignite-binary.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Binary objects cache put-get example started."); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java index c93848c..ed01eb9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/CacheClientBinaryQueryExample.java @@ -45,8 +45,8 @@ import org.apache.ignite.binary.BinaryObject; * This example demonstrates use of binary objects with cache queries. * The example populates cache with sample data and runs several SQL and full text queries over this data. * <p> - * Remote nodes should always be started with {@link org.apache.ignite.examples.binary.ExampleBinaryNodeStartup} which starts a node with - * {@code examples/config/binary/example-ignite-binary.xml} configuration. + * Remote nodes should always be started with {@link org.apache.ignite.examples.ExampleNodeStartup} which starts + * a node with {@code examples/config/example-ignite.xml} configuration. */ public class CacheClientBinaryQueryExample { /** Organization cache name. */ @@ -63,7 +63,7 @@ public class CacheClientBinaryQueryExample { * @param args Command line arguments, none required. */ public static void main(String[] args) { - try (Ignite ignite = Ignition.start("examples/config/binary/example-ignite-binary.xml")) { + try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) { System.out.println(); System.out.println(">>> Binary objects cache query example started."); http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java index 5eb2670..5340266 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java @@ -67,9 +67,7 @@ import org.jetbrains.annotations.Nullable; * String field = val.field("myFieldName"); * </pre> * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized - * typed objects at all times. In this case we do incur the deserialization cost. However, if - * {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#isKeepDeserialized()} is {@code true} then Ignite will only deserialize on the first access - * and will cache the deserialized object, so it does not have to be deserialized again: + * typed objects at all times. In this case we do incur the deserialization cost. * <pre name=code class=java> * IgniteCache<MyKey.class, MyValue.class> cache = grid.cache(null); * @@ -150,8 +148,6 @@ import org.jetbrains.annotations.Nullable; * automatically. * <h1 class="header">Configuration</h1> * By default all your objects are considered as binary and no specific configuration is needed. - * However, in some cases, like when an object is used by both Java and .Net, you may need to specify portable objects - * explicitly by calling {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#setClassNames(Collection)}. * The only requirement Ignite imposes is that your object has an empty * constructor. Note, that since server side does not have to know the class definition, * you only need to list portable objects in configuration on the client side. However, if you @@ -235,7 +231,8 @@ import org.jetbrains.annotations.Nullable; * } * </pre> * Alternatively, if you cannot change class definitions, you can provide custom serialization - * logic in {@link org.apache.ignite.binary.BinarySerializer} either globally in {@link org.apache.ignite.marshaller.portable.BinaryMarshaller} or + * logic in {@link org.apache.ignite.binary.BinarySerializer} either globally in + * {@link org.apache.ignite.configuration.BinaryConfiguration} or * for a specific type via {@link org.apache.ignite.binary.BinaryTypeConfiguration} instance. * <p> * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods. @@ -255,7 +252,7 @@ import org.jetbrains.annotations.Nullable; * internally. However, in cases when you want to provide your own ID mapping schema, * you can provide your own {@link org.apache.ignite.binary.BinaryIdMapper} implementation. * <p> - * ID-mapper may be provided either globally in {@link org.apache.ignite.marshaller.portable.BinaryMarshaller}, + * ID-mapper may be provided either globally in {@link org.apache.ignite.configuration.BinaryConfiguration}, * or for a specific type via {@link org.apache.ignite.binary.BinaryTypeConfiguration} instance. * <h1 class="header">Query Indexing</h1> * Portable objects can be indexed for querying by specifying index fields in http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index c9de3f1..c79bb12 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -162,7 +162,8 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * BinaryObject po = prj.get(1); * </pre> * <p> - * Note that this method makes sense only if cache is working in binary mode ({@link org.apache.ignite.marshaller.portable.BinaryMarshaller} is used). + * Note that this method makes sense only if cache is working in binary mode + * if default marshaller is used. * If not, this method is no-op and will return current cache. * * @return New cache instance for portable objects. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java index a4a18f6..4c31140 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java @@ -27,7 +27,8 @@ package org.apache.ignite.binary; * actually do collide {@code BinaryIdMapper} allows to override the automatically * generated hash code IDs for the type and field names. * <p> - * Binary ID mapper can be configured for all binary objects via {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#getIdMapper()} method, + * Binary ID mapper can be configured for all binary objects via + * {@link org.apache.ignite.configuration.BinaryConfiguration#getIdMapper()} method, * or for a specific binary type via {@link BinaryTypeConfiguration#getIdMapper()} method. */ public interface BinaryIdMapper { http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java b/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java index 31b3d30..3a8be3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java @@ -23,7 +23,7 @@ package org.apache.ignite.binary; * cannot be changed directly. * <p> * Binary serializer can be configured for all binary objects via - * {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#getSerializer()} method, or for a specific + * {@link org.apache.ignite.configuration.BinaryConfiguration#getSerializer()} method, or for a specific * binary type via {@link BinaryTypeConfiguration#getSerializer()} method. */ public interface BinarySerializer { http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index e87346f..e7dd9c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -45,6 +45,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheInterceptor; +import org.apache.ignite.cache.CacheKeyConfiguration; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; @@ -388,6 +389,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Query entities. */ private Collection<QueryEntity> qryEntities; + /** Cache */ + private Collection<CacheKeyConfiguration> cacheKeyCfgs; + /** Empty constructor (all values are initialized to their defaults). */ public CacheConfiguration() { /* No-op. */ @@ -422,6 +426,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { atomicityMode = cc.getAtomicityMode(); atomicWriteOrderMode = cc.getAtomicWriteOrderMode(); backups = cc.getBackups(); + cacheKeyCfgs = cc.getCacheKeyConfiguration(); cacheLoaderFactory = cc.getCacheLoaderFactory(); cacheMode = cc.getCacheMode(); cacheWriterFactory = cc.getCacheWriterFactory(); @@ -992,6 +997,28 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** + * Gets cache key configuration. Cache key configuration allows to override default cache key affinity + * by specifying affinity field name. + * + * @return Cache key configuration. + */ + public Collection<CacheKeyConfiguration> getCacheKeyConfiguration() { + return cacheKeyCfgs; + } + + /** + * Sets cache key configuration. + * + * @param cacheKeyCfgs Collection of cache key configurations. + */ + public void setCacheKeyConfiguration(Collection<CacheKeyConfiguration> cacheKeyCfgs) { + if (this.cacheKeyCfgs != null) + this.cacheKeyCfgs.addAll(cacheKeyCfgs); + else + this.cacheKeyCfgs = cacheKeyCfgs; + } + + /** * Gets cache atomicity mode. * <p> * Default value is defined by {@link #DFLT_CACHE_ATOMICITY_MODE}. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 082ffa5..305769b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -158,7 +158,7 @@ import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.lifecycle.LifecycleEventType; import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean; import org.apache.ignite.mxbean.IgniteMXBean; import org.apache.ignite.mxbean.ThreadPoolMXBean; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java new file mode 100644 index 0000000..4f8c83c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryMarshaller.java @@ -0,0 +1,144 @@ +/* + * 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.internal.portable; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.marshaller.AbstractMarshaller; +import org.apache.ignite.marshaller.MarshallerContext; +import org.jetbrains.annotations.Nullable; + +/** + * Implementation of {@link org.apache.ignite.marshaller.Marshaller} that lets to serialize and deserialize all objects + * in the portable format. + * <p> + * {@code PortableMarshaller} is tested only on Java HotSpot VM on other VMs it could yield unexpected results. + * <p> + * <h1 class="header">Configuration</h1> + * <h2 class="header">Mandatory</h2> + * This marshaller has no mandatory configuration parameters. + * <h2 class="header">Java Example</h2> + * <pre name="code" class="java"> + * PortableMarshaller marshaller = new PortableMarshaller(); + * + * IgniteConfiguration cfg = new IgniteConfiguration(); + * + * // Override marshaller. + * cfg.setMarshaller(marshaller); + * + * // Starts grid. + * G.start(cfg); + * </pre> + * <h2 class="header">Spring Example</h2> + * PortableMarshaller can be configured from Spring XML configuration file: + * <pre name="code" class="xml"> + * <bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> + * ... + * <property name="marshaller"> + * <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller"> + * ... + * </bean> + * </property> + * ... + * </bean> + * </pre> + * <p> + * <img src="http://ignite.apache.org/images/spring-small.png";> + * <br> + * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> + */ +public class BinaryMarshaller extends AbstractMarshaller { + /** */ + private GridPortableMarshaller impl; + + /** + * Returns currently set {@link MarshallerContext}. + * + * @return Marshaller context. + */ + public MarshallerContext getContext() { + return ctx; + } + + /** + * Sets {@link PortableContext}. + * <p/> + * @param ctx Portable context. + */ + @SuppressWarnings("UnusedDeclaration") + private void setPortableContext(PortableContext ctx, IgniteConfiguration cfg) { + ctx.configure(this, cfg); + + impl = new GridPortableMarshaller(ctx); + } + + /** {@inheritDoc} */ + @Override public byte[] marshal(@Nullable Object obj) throws IgniteCheckedException { + return impl.marshal(obj); + } + + /** {@inheritDoc} */ + @Override public void marshal(@Nullable Object obj, OutputStream out) throws IgniteCheckedException { + byte[] arr = marshal(obj); + + try { + out.write(arr); + } + catch (IOException e) { + throw new BinaryObjectException("Failed to marshal the object: " + obj, e); + } + } + + /** {@inheritDoc} */ + @Override public <T> T unmarshal(byte[] bytes, @Nullable ClassLoader clsLdr) throws IgniteCheckedException { + return impl.deserialize(bytes, clsLdr); + } + + /** {@inheritDoc} */ + @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws IgniteCheckedException { + ByteArrayOutputStream buf = new ByteArrayOutputStream(); + + // we have to fully read the InputStream because GridPortableMarshaller requires support of a method that + // returns number of bytes remaining. + try { + byte[] arr = new byte[4096]; + + int cnt; + + while ((cnt = in.read(arr)) != -1) + buf.write(arr, 0, cnt); + + buf.flush(); + + return impl.deserialize(buf.toByteArray(), clsLdr); + } + catch (IOException e) { + throw new BinaryObjectException("Failed to unmarshal the object from InputStream", e); + } + } + + /** {@inheritDoc} */ + @Override public void onUndeploy(ClassLoader ldr) { + impl.context().onUndeploy(ldr); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java index 974f891..d3c002e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java @@ -328,7 +328,7 @@ public class PortableClassDescriptor { } /** - * @return {@code true} if {@link OptimizedMarshaller} must be used instead of {@link org.apache.ignite.marshaller.portable.BinaryMarshaller} + * @return {@code true} if {@link OptimizedMarshaller} must be used instead of {@link BinaryMarshaller} * for object serialization and deserialization. */ public boolean useOptimizedMarshaller() { http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 01bc9d8..8f37517 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -71,7 +71,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.marshaller.MarshallerContext; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 4439eee..178c5f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -112,7 +112,7 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.jdk.JdkMarshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.spi.IgniteNodeValidationResult; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java index 05e9263..483b6ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java @@ -69,7 +69,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; import sun.misc.Unsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java index 29d5155..385b4b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStore; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * Default store manager implementation. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java index b53cc46..4bd311b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurat import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.platform.cpp.PlatformCppConfiguration; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java index a0c5a0b..c506a35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java @@ -38,7 +38,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/main/java/org/apache/ignite/marshaller/portable/BinaryMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/BinaryMarshaller.java deleted file mode 100644 index 455c83e..0000000 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/BinaryMarshaller.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * 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.portable; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.portable.GridPortableMarshaller; -import org.apache.ignite.internal.portable.PortableContext; -import org.apache.ignite.marshaller.AbstractMarshaller; -import org.apache.ignite.marshaller.MarshallerContext; -import org.jetbrains.annotations.Nullable; - -/** - * Implementation of {@link org.apache.ignite.marshaller.Marshaller} that lets to serialize and deserialize all objects - * in the portable format. - * <p> - * {@code PortableMarshaller} is tested only on Java HotSpot VM on other VMs it could yield unexpected results. - * <p> - * <h1 class="header">Configuration</h1> - * <h2 class="header">Mandatory</h2> - * This marshaller has no mandatory configuration parameters. - * <h2 class="header">Java Example</h2> - * <pre name="code" class="java"> - * PortableMarshaller marshaller = new PortableMarshaller(); - * - * IgniteConfiguration cfg = new IgniteConfiguration(); - * - * // Override marshaller. - * cfg.setMarshaller(marshaller); - * - * // Starts grid. - * G.start(cfg); - * </pre> - * <h2 class="header">Spring Example</h2> - * PortableMarshaller can be configured from Spring XML configuration file: - * <pre name="code" class="xml"> - * <bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> - * ... - * <property name="marshaller"> - * <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller"> - * ... - * </bean> - * </property> - * ... - * </bean> - * </pre> - * <p> - * <img src="http://ignite.apache.org/images/spring-small.png";> - * <br> - * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> - */ -public class BinaryMarshaller extends AbstractMarshaller { - /** */ - private GridPortableMarshaller impl; - - /** - * Returns currently set {@link MarshallerContext}. - * - * @return Marshaller context. - */ - public MarshallerContext getContext() { - return ctx; - } - - /** - * Sets {@link PortableContext}. - * <p/> - * @param ctx Portable context. - */ - @SuppressWarnings("UnusedDeclaration") - private void setPortableContext(PortableContext ctx, IgniteConfiguration cfg) { - ctx.configure(this, cfg); - - impl = new GridPortableMarshaller(ctx); - } - - /** {@inheritDoc} */ - @Override public byte[] marshal(@Nullable Object obj) throws IgniteCheckedException { - return impl.marshal(obj); - } - - /** {@inheritDoc} */ - @Override public void marshal(@Nullable Object obj, OutputStream out) throws IgniteCheckedException { - byte[] arr = marshal(obj); - - try { - out.write(arr); - } - catch (IOException e) { - throw new BinaryObjectException("Failed to marshal the object: " + obj, e); - } - } - - /** {@inheritDoc} */ - @Override public <T> T unmarshal(byte[] bytes, @Nullable ClassLoader clsLdr) throws IgniteCheckedException { - return impl.deserialize(bytes, clsLdr); - } - - /** {@inheritDoc} */ - @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws IgniteCheckedException { - ByteArrayOutputStream buf = new ByteArrayOutputStream(); - - // we have to fully read the InputStream because GridPortableMarshaller requires support of a method that - // returns number of bytes remaining. - try { - byte[] arr = new byte[4096]; - - int cnt; - - while ((cnt = in.read(arr)) != -1) - buf.write(arr, 0, cnt); - - buf.flush(); - - return impl.deserialize(buf.toByteArray(), clsLdr); - } - catch (IOException e) { - throw new BinaryObjectException("Failed to unmarshal the object from InputStream", e); - } - } - - /** {@inheritDoc} */ - @Override public void onUndeploy(ClassLoader ldr) { - impl.context().onUndeploy(ldr); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java index dd08390..b651db8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsAbstractSelfTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.math.BigDecimal; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsHeapSelfTest.java index 53ba212..d7192e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsHeapSelfTest.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.portable; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; - /** * Field tests for heap-based portables. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsOffheapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsOffheapSelfTest.java index 68bfb30..e353596 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsOffheapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFieldsOffheapSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.portable; import org.apache.ignite.internal.util.GridUnsafe; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.eclipse.jetty.util.ConcurrentHashSet; import sun.misc.Unsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java index 7267b16..036bf8f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsAbstractSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsHeapSelfTest.java index 471bd44..c71cb5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsHeapSelfTest.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.portable; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; - /** * Compact offsets tests for heap portable objects. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsOffheapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsOffheapSelfTest.java index 7b44b80..536b8b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsOffheapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryFooterOffsetsOffheapSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.portable; import org.apache.ignite.internal.util.GridUnsafe; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.eclipse.jetty.util.ConcurrentHashSet; import sun.misc.Unsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java index 4584575..34bd4a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java @@ -41,7 +41,6 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java index 356a25b..31ecd36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderAdditionalSelfTest.java @@ -46,7 +46,6 @@ import org.apache.ignite.internal.portable.mutabletest.GridBinaryMarshalerAwareT import org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.processors.cache.portable.IgniteBinaryImpl; import org.apache.ignite.internal.util.lang.GridMapEntry; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryType; import org.apache.ignite.binary.BinaryObject; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderSelfTest.java index 7f023f3..a57ed0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryObjectBuilderSelfTest.java @@ -44,7 +44,6 @@ import org.apache.ignite.internal.portable.mutabletest.GridPortableTestClasses.T import org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import sun.misc.Unsafe; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java index 9fb3a6f..3851bbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableAffinityKeySelfTest.java @@ -33,7 +33,6 @@ import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteRunnable; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java index 917298a..346cf80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.MarshallerContextAdapter; import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.io.Externalizable; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java index 5c25d3b..c3521c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.IgniteBinary; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.binary.BinaryType; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java index a00ad75..0fb5381 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java @@ -27,7 +27,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java index c855c9d..cc4d228 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.testframework.GridTestExternalClassLoader; import org.apache.ignite.testframework.config.GridTestProperties; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java index 7ee6cb6..3938bc6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.binary.BinaryReader; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java index 5fb02b6..f1e427b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.binary.BinaryObject; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractSelfTest.java index 3925045..29b7204 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheBinaryObjectsAbstractSelfTest.java @@ -46,7 +46,7 @@ import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.Binarylizable; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java index 99e2073..af38b74 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryType; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java index 256e5fd..9d296cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java index d3df9b7..892a891 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.cache.store.CacheStoreAdapter; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; 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; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java index 30a7ca5..a965588 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfT import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java index b01a363..d15f321 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObject; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java index 3777a20..0599863 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.stream.StreamReceiver; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java index 6ce5961..72f71b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.binary.BinaryObject; http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java index c18260b..a6ff3ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheKeyConfiguration; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryTypeConfiguration; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheMemoryModePortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheMemoryModePortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheMemoryModePortableSelfTest.java index 0f3e67c..71cf106 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheMemoryModePortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheMemoryModePortableSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheMemoryModeSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * Memory models test. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java index 8996355..80353c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredAtomicSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java index 1eb5d1a..a8c87ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObject; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java index 85f0298..0665f20 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.binary.BinaryObject; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java index 22c9a70..8ab7f42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java index 8e4bb35..ce3a9e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAbstractNearPartitionedByteArrayValuesSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.java index 256e0c2..e20166e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; /** * http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java index 5c5bb5a..f0f5fcc 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java @@ -18,7 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java index 09a0adb..6e34a98 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java @@ -44,7 +44,7 @@ import org.apache.ignite.internal.processors.cache.portable.distributed.dht.Grid import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortablesNearPartitionedByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java index 4d9456a..d967e3b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java @@ -24,10 +24,8 @@ import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; /** * Checks behavior on exception while unmarshalling key. http://git-wip-us.apache.org/repos/asf/ignite/blob/7ea000aa/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java index b241b86..4e9be93 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java @@ -45,7 +45,7 @@ import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheCon import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest; import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; -import org.apache.ignite.marshaller.portable.BinaryMarshaller; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; import org.apache.ignite.testframework.config.GridTestProperties;
![http://ignite.apache.org/images/spring-small.png"](http://ignite.apache.org/images/spring-small.png"){kind=link}