You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 14:56:38 UTC
[2/4] incubator-ignite git commit: IGNITE-383 Rename preload to
rebalance.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 51cea4d..0e8a422 100644
--- 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
@@ -31,7 +31,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
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.*;
/**
@@ -62,7 +62,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
cCfg.setAtomicityMode(atomicityMode());
cCfg.setAtomicWriteOrderMode(writeOrderMode());
cCfg.setDistributionMode(distributionMode());
- cCfg.setPreloadMode(SYNC);
+ cCfg.setRebalanceMode(SYNC);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
cCfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
----------------------------------------------------------------------
diff --git 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
index 0fcae87..361dc51 100644
--- 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
@@ -100,7 +100,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
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/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 557390f..bd09833 100644
--- 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
@@ -59,7 +59,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA
ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
ccfg.setCacheMode(CacheMode.PARTITIONED);
- ccfg.setPreloadPartitionedDelay(-1);
+ ccfg.setRebalancePartitionedDelay(-1);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git 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
index da3ac7b..6effba3 100644
--- 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
@@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
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.*;
/**
@@ -67,7 +67,7 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
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/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
index 602a321..44f2853 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
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.*;
/**
@@ -57,7 +57,7 @@ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractT
cc.setCacheMode(PARTITIONED);
cc.setBackups(1);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setEvictionPolicy(new CacheFifoEvictionPolicy(100));
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------
diff --git 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
index e0953d2..d56d5b1 100644
--- 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
@@ -31,7 +31,7 @@ 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.*;
@@ -72,7 +72,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setBackups(1);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index c0f4200..8a49b46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
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.*;
@@ -86,7 +86,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setBackups(0);
return cc;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 61d7f0d..923fd72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -33,7 +33,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
-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.*;
@@ -55,7 +55,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
protected int backups = DFLT_BACKUPS;
@@ -76,7 +76,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private static volatile int idx = -1;
/** Preload mode. */
- protected CachePreloadMode preloadMode = ASYNC;
+ protected CacheRebalanceMode preloadMode = ASYNC;
/** */
protected int preloadBatchSize = DFLT_BATCH_SIZE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 334147b..23d58b7 100644
--- 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
@@ -28,7 +28,7 @@ import org.apache.ignite.transactions.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
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.*;
@@ -53,7 +53,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
ccfg.setBackups(1);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setDistributionMode(distributionMode());
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
index 2b8957b..908f7f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
@@ -52,7 +52,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setPreloadMode(CachePreloadMode.SYNC);
+ ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
index 073381c..4bb6605 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
@@ -30,7 +30,7 @@ import javax.cache.expiry.*;
import java.util.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -63,7 +63,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(gridName);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setCacheStoreFactory(null);
cfg.setWriteThrough(false);
cfg.setReadThrough(false);
@@ -103,7 +103,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
cache1.preloader().syncFuture().get();
- Collection<Event> evts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
assertEquals("Expected all entries are preloaded.", KEYS_NUM, evts.size());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------
diff --git 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
index e4d4e5c..4f9908a 100644
--- 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
@@ -35,7 +35,7 @@ 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.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -88,7 +88,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(cacheMode());
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git 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
index 1784c1c..3b16ff8 100644
--- 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
@@ -42,7 +42,7 @@ 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.*;
/**
@@ -201,7 +201,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
ccfg.setName(CACHE_NAME);
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setSwapEnabled(false);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setEvictionPolicy(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
----------------------------------------------------------------------
diff --git 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
index b78857d..6298992 100644
--- 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
@@ -35,7 +35,7 @@ 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.*;
/**
* Partitioned affinity test.
@@ -77,7 +77,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra
cacheCfg.setBackups(BACKUPS);
cacheCfg.setAffinity(aff);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 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
index cc0d899..1c0a7b2 100644
--- 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
@@ -34,7 +34,7 @@ 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.*;
/**
@@ -75,7 +75,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(getCacheMode());
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
@@ -104,7 +104,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
Ignite g2 = startGrid("g2");
- Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
checkPreloadEvents(evts, g2, U.toIntList(new int[]{1, 2, 3}));
}
@@ -119,7 +119,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
for (Event evt : evts) {
CacheEvent cacheEvt = (CacheEvent)evt;
- assertEquals(EVT_CACHE_PRELOAD_OBJECT_LOADED, cacheEvt.type());
+ assertEquals(EVT_CACHE_REBALANCE_OBJECT_LOADED, cacheEvt.type());
assertEquals(g.jcache(null).getName(), cacheEvt.cacheName());
assertEquals(g.cluster().localNode().id(), cacheEvt.node().id());
assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index 802ac4a..9818176 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.io.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -41,10 +41,10 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
protected static final String TEST_STRING = "ABC";
/** */
- protected static final CachePreloadMode DFLT_PRELOAD_MODE = SYNC;
+ protected static final CacheRebalanceMode DFLT_PRELOAD_MODE = SYNC;
/** */
- protected CachePreloadMode preloadMode = DFLT_PRELOAD_MODE;
+ protected CacheRebalanceMode preloadMode = DFLT_PRELOAD_MODE;
/** */
protected LifecycleBean lifecycleBean;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 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
index da111a6..c5acd6b 100644
--- 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
@@ -32,7 +32,7 @@ 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.*;
@@ -56,7 +56,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
@@ -74,7 +74,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
private static volatile int idx = -1;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -112,8 +112,8 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setStartSize(20);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 4f5da0b..50be8d7 100644
--- 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
@@ -31,7 +31,7 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
-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.*;
@@ -75,7 +75,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
ccfg.setCacheMode(cacheMode());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setDistributionMode(partitionDistributionMode());
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
if (cacheMode() == CacheMode.PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
index 370e118..8436ad4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
@@ -30,7 +30,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-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.*;
@@ -209,7 +209,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(gridName);
- cfg.setPreloadMode(ASYNC);
+ cfg.setRebalanceMode(ASYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 1627a21..41f58dc 100644
--- 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
@@ -37,7 +37,7 @@ 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.*;
@@ -76,7 +76,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
ccfg.setAtomicityMode(ATOMIC);
ccfg.setDistributionMode(NEAR_PARTITIONED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
assert writeOrderMode != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
index 8b30392..8441b28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.log4j.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Test txs in single-threaded mode for colocated cache.
@@ -57,7 +57,7 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
TcpDiscoverySpi spi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 5a6cd22..fd5e5cc 100644
--- 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
@@ -38,7 +38,7 @@ 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.*;
/**
@@ -73,7 +73,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
cacheCfg.setSwapEnabled(false);
cacheCfg.setEvictSynchronized(true);
cacheCfg.setEvictNearSynchronized(true);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
cacheCfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git 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
index f8f8ff1..10ccaeb 100644
--- 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
@@ -39,7 +39,7 @@ 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.*;
/**
@@ -70,7 +70,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setSwapEnabled(false);
cacheCfg.setEvictSynchronized(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index cc274ce..7512f71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -36,7 +36,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests for internal DHT entry.
@@ -64,7 +64,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 2));
cacheCfg.setBackups(0);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 49ae9db..2071bfa 100644
--- 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
@@ -30,7 +30,7 @@ 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.*;
/**
* Tests dht mapping.
@@ -50,7 +50,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setBackups(BACKUPS);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index 36df6bf..277d0da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
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.*;
@@ -48,13 +48,13 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -82,9 +82,9 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index fe88081..c9dd9ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -42,7 +42,7 @@ 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.*;
/**
* Test cases for partitioned cache {@link GridDhtPreloader preloader}.
@@ -55,7 +55,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
private static final int PRELOAD_DELAY = 5000;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** Preload delay. */
private long delay = -1;
@@ -73,8 +73,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadPartitionedDelay(delay);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalancePartitionedDelay(delay);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 128));
cc.setBackups(1);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -130,7 +130,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
g2.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
@@ -138,7 +138,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
info("Beginning to wait for cache1 repartition.");
@@ -207,7 +207,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
g2.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
@@ -215,7 +215,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
U.sleep(1000);
@@ -245,7 +245,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
/** @throws Exception If failed. */
public void testAutomaticPreload() throws Exception {
delay = 0;
- preloadMode = CachePreloadMode.SYNC;
+ preloadMode = CacheRebalanceMode.SYNC;
Ignite g0 = startGrid(0);
@@ -322,7 +322,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
/** @throws Exception If failed. */
public void testManualPreloadSyncMode() throws Exception {
- preloadMode = CachePreloadMode.SYNC;
+ preloadMode = CacheRebalanceMode.SYNC;
delay = -1;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 1248770..4d09a78 100644
--- 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
@@ -38,7 +38,7 @@ 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.*;
@@ -82,12 +82,12 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
- //cacheCfg.setPreloadThreadPoolSize(1);
+ //cacheCfg.setRebalanceThreadPoolSize(1);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -255,7 +255,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
return true;
}
- }, EVTS_CACHE_PRELOAD);
+ }, EVTS_CACHE_REBALANCE);
list.add(g);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index e58c16e..f4a1058 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -47,7 +47,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
private static final int KEY_CNT = 1000;
/** Preload mode. */
- private CachePreloadMode preloadMode = CachePreloadMode.SYNC;
+ private CacheRebalanceMode preloadMode = CacheRebalanceMode.SYNC;
/** IP finder. */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -62,7 +62,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 521));
cc.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index 6ac5f7d..287245d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
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.*;
/**
@@ -54,7 +54,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
private int backups;
/** Preload mode. */
- private CachePreloadMode preloadMode;
+ private CacheRebalanceMode preloadMode;
/** IP finder. */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -69,7 +69,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setBackups(backups);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index ae94b12..c03ac23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
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.CacheConfiguration.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -60,13 +60,13 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -109,9 +109,9 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadBatchSize(preloadBatchSize);
+ cacheCfg.setRebalanceBatchSize(preloadBatchSize);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
@@ -145,7 +145,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
* @return {@code True} if synchronous preloading.
*/
private boolean isSync(GridCache<?, ?> c) {
- return c.configuration().getPreloadMode() == SYNC;
+ return c.configuration().getRebalanceMode() == SYNC;
}
/**
@@ -269,14 +269,14 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
futs.add(waitForLocalEvent(last.events(), new P1<Event>() {
@Override public boolean apply(Event e) {
- CachePreloadingEvent evt = (CachePreloadingEvent)e;
+ CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
ClusterNode node = evt.discoveryNode();
- return evt.type() == EVT_CACHE_PRELOAD_STOPPED && node.id().equals(nodeId) &&
+ return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
evt.discoveryEventType() == EVT_NODE_LEFT;
}
- }, EVT_CACHE_PRELOAD_STOPPED));
+ }, EVT_CACHE_REBALANCE_STOPPED));
info("Before grid stop [name=" + g.name() + ", fullTop=" + top2string(ignites));
@@ -452,7 +452,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EVTS_CACHE_PRELOAD);
+ }, EVTS_CACHE_REBALANCE);
list.add(g);
}
@@ -536,14 +536,14 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
for (Ignite gg : ignites)
futs.add(waitForLocalEvent(gg.events(), new P1<Event>() {
@Override public boolean apply(Event e) {
- CachePreloadingEvent evt = (CachePreloadingEvent)e;
+ CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
ClusterNode node = evt.discoveryNode();
- return evt.type() == EVT_CACHE_PRELOAD_STOPPED && node.id().equals(nodeId) &&
+ return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
evt.discoveryEventType() == EVT_NODE_LEFT;
}
- }, EVT_CACHE_PRELOAD_STOPPED));
+ }, EVT_CACHE_REBALANCE_STOPPED));
info("Before grid stop [name=" + g.name() + ", fullTop=" + top2string(ignites));
@@ -618,7 +618,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
ClusterNode loc = ignite.cluster().localNode();
- boolean sync = cache.getConfiguration(CacheConfiguration.class).getPreloadMode() == SYNC;
+ boolean sync = cache.getConfiguration(CacheConfiguration.class).getRebalanceMode() == SYNC;
for (int i = 0; i < cnt; i++) {
Collection<ClusterNode> nodes = ignite.cluster().nodes();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 9ff1bf2..fa04778 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -34,7 +34,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
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.CacheConfiguration.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
@@ -53,7 +53,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Default cache count. */
private static final int DFLT_CACHE_CNT = 10;
@@ -62,7 +62,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -95,9 +95,9 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
cacheCfg.setName("partitioned-" + i);
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadBatchSize(preloadBatchSize);
+ cacheCfg.setRebalanceBatchSize(preloadBatchSize);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -135,7 +135,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
* @return {@code True} if synchronoous preloading.
*/
private boolean isSync(IgniteCache<?, ?> c) {
- return c.getConfiguration(CacheConfiguration.class).getPreloadMode() == SYNC;
+ return c.getConfiguration(CacheConfiguration.class).getRebalanceMode() == SYNC;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index 480d01c..38a87d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
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.*;
/**
@@ -46,13 +46,13 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -83,9 +83,9 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------
diff --git 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
index f0a7be7..b64d59a 100644
--- 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
@@ -24,7 +24,7 @@ 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.*;
/**
@@ -49,7 +49,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setDistributionMode(PARTITIONED_ONLY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
index 0408ca3..212bd35 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.*;
import java.util.*;
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.*;
/**
@@ -41,7 +41,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
private boolean replicatedAffinity = true;
/** */
- private CachePreloadMode preloadMode = SYNC;
+ private CacheRebalanceMode preloadMode = SYNC;
/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration() {
@@ -76,7 +76,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
}
});
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
return cacheCfg;
}
@@ -118,7 +118,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
for (Object key : g2Keys)
g2.jcache(null).put(key, "changed val");
- Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
checkPreloadEvents(evts, g2, g2Keys);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git 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
index c64f9a5..00bee77 100644
--- 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
@@ -40,7 +40,7 @@ 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.*;
@@ -77,7 +77,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
cc.setCacheMode(PARTITIONED);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
cc.setBackups(1);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setDistributionMode(PARTITIONED_ONLY);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index f8c41f0..f983248 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
@@ -33,7 +32,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
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.*;
/**
@@ -61,7 +60,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
protected CacheConfiguration cacheConfiguration() {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
cacheCfg.setBackups(0);
return cacheCfg;
@@ -93,12 +92,12 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
Thread.sleep(5000);
Collection<Event> objEvts =
- g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED);
+ g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
checkObjectUnloadEvents(objEvts, g1, g2Keys);
Collection <Event> partEvts =
- g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED);
+ g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_PART_UNLOADED);
checkPartitionUnloadEvents(partEvts, g1, dht(g2.jcache(null)).topology().localPartitions());
}
@@ -114,7 +113,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
for (Event evt : evts) {
CacheEvent cacheEvt = ((CacheEvent)evt);
- assertEquals(EVT_CACHE_PRELOAD_OBJECT_UNLOADED, cacheEvt.type());
+ assertEquals(EVT_CACHE_REBALANCE_OBJECT_UNLOADED, cacheEvt.type());
assertEquals(g.jcache(null).getName(), cacheEvt.cacheName());
assertEquals(g.cluster().localNode().id(), cacheEvt.node().id());
assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id());
@@ -132,7 +131,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
assertEquals(parts.size(), evts.size());
for (Event evt : evts) {
- CachePreloadingEvent unloadEvt = (CachePreloadingEvent)evt;
+ CacheRebalancingEvent unloadEvt = (CacheRebalancingEvent)evt;
final int part = unloadEvt.partition();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 173940d..c6214e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
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.*;
/**
@@ -89,7 +89,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setWriteSynchronizationMode(writeSync);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index 7470174..df2bd9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -33,7 +33,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Partitioned affinity test.
@@ -78,7 +78,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
cc.setAffinity(affinityFunction());
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
index 96e3afa..03ac4aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*;
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.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Multi-node tests for partitioned cache.
@@ -50,7 +50,7 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cc = super.cacheConfiguration(gridName);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setBackups(1);
cc.setAtomicWriteOrderMode(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
index b61ff36..7ecc3cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
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.*;
/**
@@ -39,7 +39,7 @@ public class GridCacheAtomicPartitionedMetricsSelfTest extends GridCacheAbstract
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setAtomicityMode(ATOMIC);
cfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git 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
index eca69b7..a7d560b 100644
--- 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
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
@@ -31,13 +30,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
-import java.util.concurrent.*;
-
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.*;
/**
@@ -60,7 +57,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
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/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 1a6a4ff..5baf882 100644
--- 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
@@ -34,7 +34,7 @@ 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.*;
@@ -70,7 +70,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
TcpDiscoverySpi spi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git 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
index ded7c89..b3d153b 100644
--- 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
@@ -34,7 +34,7 @@ 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.*;
@@ -61,7 +61,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
cacheCfg.setDistributionMode(nearOnly ? NEAR_ONLY : NEAR_PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cfg.setCacheConfiguration(cacheCfg);