ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [13/14] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4938
Date Fri, 14 Apr 2017 15:08:52 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 446b9a5,1216db8..0c8a26d
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@@ -23,8 -23,8 +23,9 @@@ import java.util.Iterator
  import java.util.Map;
  import java.util.Properties;
  import javax.net.ssl.HostnameVerifier;
 +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.lang.IgnitePredicate;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.jetbrains.annotations.Nullable;
  
  /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 74b4dcd,c991319..6ab5393
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -97,8 -100,6 +100,7 @@@ import org.apache.ignite.internal.manag
  import org.apache.ignite.internal.managers.failover.GridFailoverManager;
  import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
  import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
- import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
 +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.internal.processors.GridProcessor;
  import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
  import org.apache.ignite.internal.processors.cache.GridCacheAdapter;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 9227b82,f339253..da46496
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@@ -17,33 -17,6 +17,34 @@@
  
  package org.apache.ignite.internal.binary;
  
 +import java.io.File;
 +import java.io.IOException;
 +import java.lang.reflect.Field;
 +import java.math.BigDecimal;
 +import java.net.URISyntaxException;
 +import java.net.URL;
 +import java.net.URLClassLoader;
 +import java.sql.Time;
 +import java.sql.Timestamp;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Date;
 +import java.util.Enumeration;
 +import java.util.HashMap;
 +import java.util.HashSet;
++import java.util.Iterator;
 +import java.util.LinkedHashMap;
 +import java.util.LinkedHashSet;
 +import java.util.LinkedList;
 +import java.util.Map;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.TreeSet;
 +import java.util.UUID;
 +import java.util.concurrent.ConcurrentMap;
 +import java.util.jar.JarEntry;
 +import java.util.jar.JarFile;
  import org.apache.ignite.IgniteCheckedException;
  import org.apache.ignite.IgniteException;
  import org.apache.ignite.IgniteLogger;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index 257b34c,75f1807..22948f7
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@@ -24,9 -24,9 +24,10 @@@ import org.apache.ignite.IgniteCheckedE
  import org.apache.ignite.IgniteException;
  import org.apache.ignite.internal.MarshallerContextImpl;
  import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
 +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
  import org.apache.ignite.internal.util.typedef.internal.U;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.plugin.PluginProvider;
  import org.jetbrains.annotations.Nullable;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
index 1545444,bc8220f..8865b2d
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
@@@ -26,11 -26,12 +26,12 @@@ import java.util.List
  import java.util.zip.ZipEntry;
  import java.util.zip.ZipInputStream;
  import java.util.zip.ZipOutputStream;
 -
  import org.apache.ignite.IgniteCheckedException;
  import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
 +import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
  import org.apache.ignite.internal.util.typedef.internal.U;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.plugin.PluginProvider;
  import org.jetbrains.annotations.Nullable;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
index e34e8cc,4c0ce17..ccd9946
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
@@@ -45,8 -45,8 +45,9 @@@ import java.util.Map
  import java.util.Properties;
  import java.util.UUID;
  import java.util.concurrent.ConcurrentMap;
+ 
  import org.apache.ignite.internal.util.GridUnsafe;
 +import org.apache.ignite.internal.util.SerializableTransient;
  import org.apache.ignite.internal.util.typedef.internal.U;
  import org.apache.ignite.lang.IgniteProductVersion;
  import org.apache.ignite.marshaller.MarshallerContext;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index 3ab27ac,8ffeacd..e62c171
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@@ -19,8 -19,10 +19,9 @@@ package org.apache.ignite.marshaller
  
  import java.io.InputStream;
  import java.io.OutputStream;
 -
  import org.apache.ignite.IgniteBinary;
  import org.apache.ignite.IgniteCheckedException;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.jetbrains.annotations.Nullable;
  
  /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
index 6759c40,8c27841..997c9f1
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
@@@ -21,8 -21,8 +21,9 @@@ import java.io.InputStream
  import java.io.ObjectInputStream;
  import java.io.ObjectOutputStream;
  import java.io.OutputStream;
 +import org.apache.ignite.IgniteBinary;
  import org.apache.ignite.IgniteCheckedException;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.internal.util.io.GridByteArrayInputStream;
  import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
  import org.apache.ignite.internal.util.typedef.internal.S;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
index 1b2ed1b,9ee8d69..8000738
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
@@@ -30,9 -30,9 +30,10 @@@ import org.apache.ignite.cache.CacheMod
  import org.apache.ignite.configuration.CacheConfiguration;
  import org.apache.ignite.configuration.IgniteConfiguration;
  import org.apache.ignite.internal.IgniteInternalFuture;
 +import org.apache.ignite.internal.binary.BinaryMarshaller;
  import org.apache.ignite.internal.util.typedef.F;
  import org.apache.ignite.internal.util.typedef.T2;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
  import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
index 9847209,40440e0..9d10fd0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
@@@ -26,8 -26,8 +26,9 @@@ import org.apache.ignite.cache.CacheAto
  import org.apache.ignite.configuration.CacheConfiguration;
  import org.apache.ignite.configuration.IgniteConfiguration;
  import org.apache.ignite.internal.IgniteInternalFuture;
 +import org.apache.ignite.internal.binary.BinaryMarshaller;
  import org.apache.ignite.internal.util.typedef.internal.U;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
  import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
index a81bba5,47af49b..13a0dd8
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
@@@ -24,8 -21,13 +24,9 @@@ import org.apache.ignite.IgniteCheckedE
  import org.apache.ignite.lang.IgniteUuid;
  import org.apache.ignite.marshaller.Marshaller;
  import org.apache.ignite.marshaller.MarshallerContextTestImpl;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  import org.jetbrains.annotations.Nullable;
  
 -import java.io.Externalizable;
 -import java.util.Random;
 -import java.util.concurrent.Callable;
 -
  /**
   * {@link IgfsEntryInfo} test case.
   */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
index 549385f,1d08c48..61c575c
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
@@@ -85,27 -83,10 +83,10 @@@ public class ConfigVariations 
      );
  
      /** */
-     private static final ConfigParameter<Object> ONHEAP_TIERED_MEMORY_PARAM =
-         Parameters.parameter("setMemoryMode", CacheMemoryMode.ONHEAP_TIERED);
- 
-     /** */
-     private static final ConfigParameter<Object> OFFHEAP_TIERED_MEMORY_PARAM =
-         Parameters.parameter("setMemoryMode", CacheMemoryMode.OFFHEAP_TIERED);
- 
-     /** */
-     private static final ConfigParameter<Object> OFFHEAP_VALUES_MEMORY_PARAM =
-         Parameters.parameter("setMemoryMode", CacheMemoryMode.OFFHEAP_VALUES);
- 
-     /** */
-     private static final ConfigParameter<Object> OFFHEAP_ENABLED =
-         Parameters.parameter("setOffHeapMaxMemory", 10 * 1024 * 1024L);
- 
-     /** */
      @SuppressWarnings("unchecked")
      private static final ConfigParameter<IgniteConfiguration>[][] BASIC_IGNITE_SET
= new ConfigParameter[][] {
 -        Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class),
optimizedMarshallerFactory()),
 +        Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class),
binaryMarshallerFactory()),
          Parameters.booleanParameters("setPeerClassLoadingEnabled"),
-         Parameters.objectParameters("setSwapSpaceSpi", Parameters.factory(GridTestSwapSpaceSpi.class)),
      };
  
      /** */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
index 1101c90,f2d1556..170bb33
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
@@@ -36,15 -33,10 +32,9 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest;
  import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest;
  import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest;
- import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheMemoryModeBinarySelfTest;
- import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredAtomicBinarySelfTest;
- import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionAtomicBinarySelfTest;
- import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionBinarySelfTest;
- import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredBinarySelfTest;
  import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesNearPartitionedByteArrayValuesSelfTest;
  import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest;
- import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheAtomicLocalOffheapExpiryPolicyTest;
  import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest;
 -import org.apache.ignite.testframework.config.GridTestProperties;
  
  /**
   * Cache suite with binary marshaller.

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
index c2ed4ff,7efc7de..c73ed3e
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
@@@ -48,8 -46,7 +46,6 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.igfs.IgfsModesSelfTest;
  import org.apache.ignite.internal.processors.igfs.IgfsPrimaryMultiNodeSelfTest;
  import org.apache.ignite.internal.processors.igfs.IgfsOneClientNodeTest;
- import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapTieredSelfTest;
- import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapValuesSelfTest;
 -import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOptimziedMarshallerSelfTest;
  import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyClientSelfTest;
  import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest;
  import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencySelfTest;
@@@ -92,9 -89,8 +88,6 @@@ public class IgniteIgfsTestSuite extend
          suite.addTest(new TestSuite(IgfsPrimaryRelaxedConsistencySelfTest.class));
          suite.addTest(new TestSuite(IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest.class));
  
-         suite.addTest(new TestSuite(IgfsPrimaryOffheapTieredSelfTest.class));
-         suite.addTest(new TestSuite(IgfsPrimaryOffheapValuesSelfTest.class));
 -        suite.addTest(new TestSuite(IgfsPrimaryOptimziedMarshallerSelfTest.class));
--
          suite.addTest(new TestSuite(IgfsDualSyncSelfTest.class));
          suite.addTest(new TestSuite(IgfsDualAsyncSelfTest.class));
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index b385738,ec83687..a562342
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@@ -37,8 -37,8 +37,9 @@@ import org.apache.ignite.cache.CacheWri
  import org.apache.ignite.cache.query.SqlFieldsQuery;
  import org.apache.ignite.configuration.CacheConfiguration;
  import org.apache.ignite.configuration.IgniteConfiguration;
 +import org.apache.ignite.internal.binary.BinaryMarshaller;
  import org.apache.ignite.internal.util.typedef.internal.U;
+ import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
  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;
@@@ -76,10 -73,8 +74,8 @@@ public abstract class AbstractH2Compare
  
          c.setDiscoverySpi(disco);
  
 -        c.setMarshaller(new OptimizedMarshaller(true));
 +        c.setMarshaller(new BinaryMarshaller());
  
-         c.setCacheConfiguration(cacheConfigurations());
- 
          return c;
      }
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89cc392/modules/yardstick/config/ignite-int-max-values-onheap-config.xml
----------------------------------------------------------------------


Mime
View raw message