ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [45/50] [abbrv] incubator-ignite git commit: Merge branch ignite-sql-tests into ignite-45
Date Sat, 14 Mar 2015 02:37:25 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index cd0504b,85fca1a..3af3131
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@@ -32,8 -32,9 +32,8 @@@ import org.apache.ignite.testframework.
  import java.util.*;
  import java.util.concurrent.atomic.*;
  
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.internal.GridTopic.*;
  
@@@ -85,11 -86,12 +85,11 @@@ public class GridCachePartitionedGetSel
  
          cc.setCacheMode(PARTITIONED);
          cc.setBackups(1);
-         cc.setPreloadMode(SYNC);
+         cc.setRebalanceMode(SYNC);
          cc.setWriteSynchronizationMode(FULL_SYNC);
          cc.setSwapEnabled(true);
 -        cc.setEvictNearSynchronized(false);
          cc.setEvictSynchronized(false);
 -        cc.setDistributionMode(PARTITIONED_ONLY);
 +        cc.setNearConfiguration(null);
  
          return cc;
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index 23454d8,56a4168..db847b8
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
@@@ -56,8 -56,9 +56,8 @@@ public class GridCachePartitionedProjec
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setBackups(BACKUPS);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
  
          cfg.setCacheConfiguration(cacheCfg);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 0eeed7b,742a70e..fd8143b
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@@ -38,8 -38,9 +38,8 @@@ import java.util.concurrent.*
  import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.events.EventType.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index e747b53,9654842..879298a
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@@ -620,8 -620,7 +620,7 @@@ public class GridCachePutAllFailoverSel
  
              cacheCfg.setBackups(backups);
  
 -            cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY);
 +            cacheCfg.setNearConfiguration(nearEnabled ? new NearCacheConfiguration() : null);
-             cacheCfg.setQueryIndexEnabled(false);
  
              cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 6a5617b,eddac9a..7431dc0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@@ -65,8 -65,9 +65,8 @@@ public class GridCacheSwapPreloadSelfTe
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cacheCfg.setSwapEnabled(true);
          cacheCfg.setCacheMode(cacheMode);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setEvictSynchronized(false);
 -        cacheCfg.setEvictNearSynchronized(false);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
  
          if (cacheMode == PARTITIONED)

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index d22ef42,0e8a422..b4235b0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@@ -61,8 -61,8 +61,8 @@@ public abstract class GridCacheValueCon
          cCfg.setCacheMode(PARTITIONED);
          cCfg.setAtomicityMode(atomicityMode());
          cCfg.setAtomicWriteOrderMode(writeOrderMode());
 -        cCfg.setDistributionMode(distributionMode());
 +        cCfg.setNearConfiguration(nearConfiguration());
-         cCfg.setPreloadMode(SYNC);
+         cCfg.setRebalanceMode(SYNC);
          cCfg.setWriteSynchronizationMode(FULL_SYNC);
          cCfg.setBackups(1);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
index 8967ac7,361dc51..0240fef
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
@@@ -90,11 -97,10 +90,11 @@@ public abstract class IgniteCacheAbstra
  
          commSpi.setTcpNoDelay(true);
  
 -        if (gridName.endsWith(String.valueOf(CLN_GRD)))
 -            cacheCfg.setDistributionMode(CacheDistributionMode.CLIENT_ONLY);
 +        // TODO IGNITE-45
 +//        if (gridName.endsWith(String.valueOf(CLN_GRD)))
 +//            cacheCfg.setDistributionMode(CacheDistributionMode.CLIENT_ONLY);
  
-         cacheCfg.setPreloadMode(CachePreloadMode.SYNC);
+         cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC);
  
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
index a8c676f,130b8b6..bef9860
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
@@@ -56,10 -56,10 +56,10 @@@ public class IgnitePutAllUpdateNonPrelo
  
          ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
          ccfg.setBackups(backups);
 -        ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 +        ccfg.setNearConfiguration(null);
          ccfg.setCacheMode(CacheMode.PARTITIONED);
  
-         ccfg.setPreloadPartitionedDelay(-1);
+         ccfg.setRebalanceDelay(-1);
  
          return ccfg;
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index 1ab7e48,6effba3..13f69e3
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@@ -65,8 -65,9 +65,8 @@@ public abstract class IgniteCollectionA
          ccfg.setAtomicWriteOrderMode(PRIMARY);
          ccfg.setBackups(colCfg.getBackups());
          ccfg.setMemoryMode(colCfg.getMemoryMode());
 -        ccfg.setDistributionMode(colCfg.getDistributionMode());
          ccfg.setWriteSynchronizationMode(FULL_SYNC);
-         ccfg.setPreloadMode(SYNC);
+         ccfg.setRebalanceMode(SYNC);
  
          cfg.setCacheConfiguration(ccfg);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
index d600c66,d56d5b1..d0661f7
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
@@@ -29,8 -29,9 +29,8 @@@ import org.apache.ignite.testframework.
  import java.util.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
@@@ -70,7 -71,8 +70,7 @@@ public class GridCachePartitionedNodeRe
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
-         cacheCfg.setPreloadMode(SYNC);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setBackups(1);
  
          cfg.setCacheConfiguration(cacheCfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
index e715088,23d58b7..ed2efc9
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
@@@ -52,8 -53,8 +52,8 @@@ public abstract class GridCacheAbstract
          ccfg.setAtomicityMode(TRANSACTIONAL);
          ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
          ccfg.setBackups(1);
-         ccfg.setPreloadMode(SYNC);
+         ccfg.setRebalanceMode(SYNC);
 -        ccfg.setDistributionMode(distributionMode());
 +        ccfg.setNearConfiguration(nearConfiguration());
  
          cfg.setCacheConfiguration(ccfg);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 77665b3,906d137..8b8edb7
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@@ -88,8 -88,9 +88,8 @@@ public abstract class GridCacheLockAbst
  
          cacheCfg.setCacheMode(cacheMode());
          cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
  
          return cacheCfg;
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 55029ab,3b16ff8..8d53f93
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@@ -40,8 -40,9 +40,8 @@@ import java.util.concurrent.atomic.*
  import java.util.concurrent.locks.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
index 784bfb7,beef1db..6c229f0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
@@@ -77,8 -77,9 +77,8 @@@ public class GridCachePartitionedAffini
          cacheCfg.setBackups(BACKUPS);
          cacheCfg.setAffinity(aff);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
  
          TcpDiscoverySpi spi = new TcpDiscoverySpi();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
index 12ced1e,1c0a7b2..a91ecdf
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
@@@ -32,8 -32,9 +32,8 @@@ import org.apache.ignite.testframework.
  import java.util.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.events.EventType.*;
  
  /**
@@@ -74,9 -75,9 +74,9 @@@ public abstract class GridCachePreloadE
          CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setCacheMode(getCacheMode());
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
 +        cacheCfg.setNearConfiguration(new NearCacheConfiguration());
  
          if (getCacheMode() == PARTITIONED)
              cacheCfg.setBackups(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index ce7d9f8,64d3e1f..b0d816f
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@@ -30,8 -30,9 +30,8 @@@ import org.apache.ignite.testframework.
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
  import static org.apache.ignite.configuration.CacheConfiguration.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.configuration.DeploymentMode.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
index 3159b27,2b83184..59dd05b
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
@@@ -74,8 -74,8 +74,8 @@@ public abstract class IgniteTxConsisten
          ccfg.setAtomicityMode(TRANSACTIONAL);
          ccfg.setCacheMode(cacheMode());
          ccfg.setWriteSynchronizationMode(FULL_SYNC);
 -        ccfg.setDistributionMode(partitionDistributionMode());
 +        ccfg.setNearConfiguration(nearConfiguration());
-         ccfg.setPreloadMode(SYNC);
+         ccfg.setRebalanceMode(SYNC);
  
          if (cacheMode() == CacheMode.PARTITIONED)
              ccfg.setBackups(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 5591cd5,da16e97..92603ae
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@@ -35,8 -35,9 +35,8 @@@ import java.util.*
  
  import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.internal.IgniteNodeAttributes.*;
  
@@@ -73,9 -74,9 +73,9 @@@ public class GridCacheAtomicNearCacheSe
  
          ccfg.setCacheMode(PARTITIONED);
          ccfg.setAtomicityMode(ATOMIC);
 -        ccfg.setDistributionMode(NEAR_PARTITIONED);
 +        ccfg.setNearConfiguration(new NearCacheConfiguration());
          ccfg.setWriteSynchronizationMode(FULL_SYNC);
-         ccfg.setPreloadMode(SYNC);
+         ccfg.setRebalanceMode(SYNC);
  
          assert writeOrderMode != null;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 6b15874,f9e0fbe..9593e89
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@@ -35,8 -35,9 +35,8 @@@ import org.apache.ignite.testframework.
  import java.util.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.events.EventType.*;
  
  /**
@@@ -70,8 -71,10 +70,8 @@@ public class GridCacheDhtEvictionNearRe
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cacheCfg.setSwapEnabled(false);
          cacheCfg.setEvictSynchronized(true);
-         cacheCfg.setPreloadMode(SYNC);
 -        cacheCfg.setEvictNearSynchronized(true);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(atomicityMode());
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
          cacheCfg.setBackups(1);
  
          // Set eviction queue size explicitly.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 4acbcf1,a6006fc..e3f0bca
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@@ -36,8 -36,9 +36,8 @@@ import java.util.*
  import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.events.EventType.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index 5dcfb9d,2071bfa..05b8138
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@@ -50,9 -50,10 +50,9 @@@ public class GridCacheDhtMappingSelfTes
  
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setBackups(BACKUPS);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
  
          TcpDiscoverySpi disco = new TcpDiscoverySpi();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 79f8c72,a8e9a31..98a2010
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@@ -37,8 -36,9 +37,8 @@@ import javax.cache.*
  import java.util.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.configuration.DeploymentMode.*;
  import static org.apache.ignite.events.EventType.*;
  
@@@ -86,7 -86,8 +86,7 @@@ public class GridCacheDhtPreloadDisable
          cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cacheCfg.setBackups(backups);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
-         //cacheCfg.setPreloadThreadPoolSize(1);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
+         //cacheCfg.setRebalanceThreadPoolSize(1);
  
          TcpDiscoverySpi disco = new TcpDiscoverySpi();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index 7d1cbdf,b64d59a..372976d
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@@ -22,8 -22,9 +22,8 @@@ import org.apache.ignite.cache.*
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.*;
  
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**
@@@ -48,9 -49,9 +48,9 @@@ public class GridCachePartitionedNearDi
  
          cfg.setCacheMode(PARTITIONED);
          cfg.setBackups(gridCount() - 1);
-         cfg.setPreloadMode(SYNC);
+         cfg.setRebalanceMode(SYNC);
          cfg.setWriteSynchronizationMode(FULL_SYNC);
 -        cfg.setDistributionMode(PARTITIONED_ONLY);
 +        cfg.setNearConfiguration(null);
  
          return cfg;
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index 80776bb7,a635e63..f41d7f2
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@@ -38,8 -38,9 +38,8 @@@ import java.util.*
  import java.util.concurrent.*;
  import java.util.concurrent.locks.*;
  
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.events.EventType.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
@@@ -76,8 -77,8 +76,8 @@@ public class GridCachePartitionedTopolo
          cc.setCacheMode(PARTITIONED);
          cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18));
          cc.setBackups(1);
-         cc.setPreloadMode(SYNC);
+         cc.setRebalanceMode(SYNC);
 -        cc.setDistributionMode(PARTITIONED_ONLY);
 +        cc.setNearConfiguration(null);
  
          c.setCacheConfiguration(cc);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 5e73a78,a7d560b..4fb9331
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@@ -32,8 -32,9 +32,8 @@@ import org.apache.ignite.testframework.
  
  import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**
@@@ -53,9 -54,11 +53,9 @@@ public class GridCacheNearEvictionSelfT
          CacheConfiguration cc = defaultCacheConfiguration();
  
          cc.setCacheMode(PARTITIONED);
 -        cc.setDistributionMode(NEAR_PARTITIONED);
          cc.setWriteSynchronizationMode(FULL_SYNC);
          cc.setBackups(1);
-         cc.setPreloadMode(SYNC);
+         cc.setRebalanceMode(SYNC);
 -        cc.setNearEvictionPolicy(null);
          cc.setAtomicityMode(atomicityMode());
          cc.setAtomicWriteOrderMode(PRIMARY);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 49f36a0,5baf882..e243f17
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@@ -32,8 -32,9 +32,8 @@@ import org.apache.ignite.transactions.*
  import org.apache.log4j.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 2c08f30,b3d153b..f5c1785
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@@ -32,8 -32,9 +32,8 @@@ import org.apache.ignite.transactions.*
  import java.util.concurrent.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
  
@@@ -59,9 -60,8 +59,9 @@@ public class GridCacheNearOnlyTopologyS
  
              cacheCfg.setCacheMode(PARTITIONED);
              cacheCfg.setBackups(1);
 -            cacheCfg.setDistributionMode(nearOnly ? NEAR_ONLY : NEAR_PARTITIONED);
 +            // TODO IGNITE-45
 +//            cacheCfg.setDistributionMode(nearOnly ? NEAR_ONLY : NEAR_PARTITIONED);
-             cacheCfg.setPreloadMode(SYNC);
+             cacheCfg.setRebalanceMode(SYNC);
              cacheCfg.setAtomicityMode(TRANSACTIONAL);
  
              cfg.setCacheConfiguration(cacheCfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
index 7a7b99e,121e0ed..90c4cc1
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
@@@ -31,8 -31,9 +31,8 @@@ import org.apache.ignite.testframework.
  import javax.cache.configuration.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**
@@@ -82,8 -83,8 +82,8 @@@ public class GridCacheNearPartitionedCl
          ccfg.setName(CACHE_NAME);
          ccfg.setCacheMode(PARTITIONED);
          ccfg.setAtomicityMode(TRANSACTIONAL);
 -        ccfg.setDistributionMode(NEAR_PARTITIONED);
 +        ccfg.setNearConfiguration(new NearCacheConfiguration());
-         ccfg.setPreloadMode(SYNC);
+         ccfg.setRebalanceMode(SYNC);
          ccfg.setWriteSynchronizationMode(FULL_SYNC);
          ccfg.setBackups(BACKUP_CNT);
          ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index cc7ff82,bf4c97a..d2d37d3
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@@ -37,8 -36,9 +37,8 @@@ import java.util.concurrent.atomic.*
  import java.util.concurrent.locks.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index ad8f3a7,5e13924..39e0bfd
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@@ -34,8 -34,9 +34,8 @@@ import org.apache.ignite.transactions.*
  import java.util.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
@@@ -62,10 -63,10 +62,10 @@@ public class GridCacheNearTxMultiNodeSe
  
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
 +        cacheCfg.setNearConfiguration(new NearCacheConfiguration());
          cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
          cacheCfg.setBackups(backups);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
  
          cfg.setCacheConfiguration(cacheCfg);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index a1f7350,7f65f80..24cac3c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@@ -37,8 -37,9 +37,8 @@@ import java.util.*
  import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.events.EventType.*;
  
  /**
@@@ -65,8 -66,9 +65,8 @@@ public class GridCachePartitionedAffini
          cacheCfg.setCacheMode(PARTITIONED);
          cacheCfg.setBackups(BACKUPS);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-         cacheCfg.setPreloadMode(SYNC);
+         cacheCfg.setRebalanceMode(SYNC);
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
  
          TcpDiscoverySpi spi = new TcpDiscoverySpi();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
index 01a6234,8df1064..7a379e0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
@@@ -22,8 -22,9 +22,8 @@@ import org.apache.ignite.configuration.
  import org.apache.ignite.internal.processors.cache.distributed.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  
  /**
   * Tests events.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 6ce3c49,6d9032c..7324754
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@@ -84,8 -85,8 +84,8 @@@ public class GridCachePartitionedHitsAn
          cfg.setWriteSynchronizationMode(FULL_ASYNC);
          cfg.setEvictionPolicy(null);
          cfg.setBackups(1);
 -        cfg.setDistributionMode(PARTITIONED_ONLY);
 +        cfg.setNearConfiguration(null);
-         cfg.setPreloadPartitionedDelay(-1);
+         cfg.setRebalanceDelay(-1);
          cfg.setBackups(1);
          cfg.setStatisticsEnabled(true);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 77da75b,7daa4a0..54d8fba
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@@ -40,8 -40,9 +40,8 @@@ import java.util.concurrent.*
  import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;
  import static org.apache.ignite.transactions.TransactionIsolation.*;
  
@@@ -98,9 -99,9 +98,9 @@@ public class GridCachePartitionedMultiN
          // Default cache configuration.
          CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
-         cacheCfg.setPreloadMode(NONE);
+         cacheCfg.setRebalanceMode(NONE);
          cacheCfg.setCacheMode(PARTITIONED);
 -        cacheCfg.setDistributionMode(NEAR_PARTITIONED);
 +        cacheCfg.setNearConfiguration(new NearCacheConfiguration());
          cacheCfg.setAtomicityMode(TRANSACTIONAL);
          cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cacheCfg.setBackups(backups);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index c6d0d1a,a4881f8..2ef5d15
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@@ -40,10 -41,10 +40,10 @@@ public class GridCachePartitionedNodeRe
          cc.setName(CACHE_NAME);
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(FULL_ASYNC);
 -        cc.setDistributionMode(PARTITIONED_ONLY);
 +        cc.setNearConfiguration(null);
          cc.setStartSize(20);
-         cc.setPreloadMode(preloadMode);
-         cc.setPreloadBatchSize(preloadBatchSize);
+         cc.setRebalanceMode(preloadMode);
+         cc.setRebalanceBatchSize(preloadBatchSize);
          cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
          cc.setBackups(backups);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index 9a14a75,ece9179..d36f008
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@@ -29,8 -29,9 +29,8 @@@ import org.jetbrains.annotations.*
  import java.util.concurrent.*;
  import java.util.concurrent.atomic.*;
  
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.configuration.DeploymentMode.*;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index d5f7987,1b238a5..08c5e1b
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@@ -33,8 -33,9 +33,8 @@@ import java.util.concurrent.*
  import java.util.concurrent.atomic.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  
  /**
   * Base class for eviction tests.
@@@ -71,19 -74,10 +71,19 @@@ public class GridCacheEvictionFilterSel
          cc.setSwapEnabled(false);
          cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cc.setEvictionFilter(filter);
-         cc.setPreloadMode(SYNC);
+         cc.setRebalanceMode(SYNC);
          cc.setAtomicityMode(TRANSACTIONAL);
  
 +        if (nearEnabled) {
 +            NearCacheConfiguration nearCfg = new NearCacheConfiguration();
 +            nearCfg.setNearEvictionPolicy(plc);
 +
 +            cc.setNearConfiguration(nearCfg);
 +        }
 +        else
 +            cc.setNearConfiguration(null);
 +
 +
          if (mode == PARTITIONED)
              cc.setBackups(1);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index c9db077,532a91e..7da7e45
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@@ -59,15 -59,12 +59,14 @@@ public class GridCacheLruNearEvictionPo
          cc.setAtomicityMode(atomicityMode);
          cc.setCacheMode(PARTITIONED);
          cc.setWriteSynchronizationMode(PRIMARY_SYNC);
-         cc.setPreloadMode(SYNC);
 -        cc.setDistributionMode(NEAR_PARTITIONED);
+         cc.setRebalanceMode(SYNC);
 -        cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
          cc.setStartSize(100);
-         cc.setQueryIndexEnabled(true);
          cc.setBackups(0);
  
 +        NearCacheConfiguration nearCfg = new NearCacheConfiguration();
 +        nearCfg.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
 +        cc.setNearConfiguration(nearCfg);
 +
          c.setCacheConfiguration(cc);
  
          TcpDiscoverySpi disco = new TcpDiscoverySpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index 00ba3e2,c8ac60a..6f51c00
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@@ -26,8 -27,9 +26,8 @@@ import org.apache.ignite.spi.discovery.
  import org.apache.ignite.testframework.junits.common.*;
  
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  
  /**
@@@ -68,12 -70,10 +68,11 @@@ public class GridCacheNearOnlyLruNearEv
          cc.setAtomicityMode(atomicityMode);
          cc.setCacheMode(cacheMode);
          cc.setWriteSynchronizationMode(PRIMARY_SYNC);
-         cc.setPreloadMode(SYNC);
 -        cc.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY);
+         cc.setRebalanceMode(SYNC);
 -        cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
 +        // TODO IGNITE-45
 +//        cc.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY);
 +//        cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
          cc.setStartSize(100);
-         cc.setQueryIndexEnabled(true);
          cc.setBackups(0);
  
          c.setCacheConfiguration(cc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index b39daab,0a9c0fc..5de1d99
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@@ -50,8 -50,9 +50,8 @@@ import java.util.concurrent.atomic.*
  
  import static java.util.concurrent.TimeUnit.*;
  import static org.apache.ignite.cache.CacheAtomicityMode.*;
 -import static org.apache.ignite.cache.CacheDistributionMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
- import static org.apache.ignite.cache.CachePreloadMode.*;
+ import static org.apache.ignite.cache.CacheRebalanceMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
  import static org.apache.ignite.events.EventType.*;
  import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*;
@@@ -77,10 -78,10 +77,10 @@@ public abstract class GridCacheContinuo
  
          cacheCfg.setCacheMode(cacheMode());
          cacheCfg.setAtomicityMode(atomicityMode());
 -        cacheCfg.setDistributionMode(distributionMode());
 +        cacheCfg.setNearConfiguration(nearConfiguration());
-         cacheCfg.setPreloadMode(ASYNC);
+         cacheCfg.setRebalanceMode(ASYNC);
          cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
 -        cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore()));
 +        cacheCfg.setCacheStoreFactory(new StoreFactory());
          cacheCfg.setReadThrough(true);
          cacheCfg.setWriteThrough(true);
          cacheCfg.setLoadPreviousValue(true);
@@@ -802,10 -797,10 +801,10 @@@
      public void testNodeJoin() throws Exception {
          IgniteCache<Integer, Integer> cache = grid(0).jcache(null);
  
-         ContinuousQuery<Integer, Integer> qry = Query.continuous();
+         ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>();
  
          final Collection<CacheEntryEvent<? extends Integer, ? extends Integer>> all = new ConcurrentLinkedDeque8<>();
 -        final CountDownLatch latch = new CountDownLatch(2);
 +        final CountDownLatch latch = new CountDownLatch(30);
  
          qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() {
              @Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer, ? extends Integer>> evts) {


Mime
View raw message