Merge branch 'ignite-sprint-2' into ignite-383
Conflicts:
modules/clients/src/test/dotnet/gridgain-test/config/start-test-grid1.xml
pilots/sony/tests/org/gridgain/sony/impl/SonyQueueAbstractTest.java
pilots/sony/tests/org/gridgain/sony/impl/SonyQueueServiceImplTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/026c09a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/026c09a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/026c09a3
Branch: refs/heads/sprint-2
Commit: 026c09a35ec27368f4cee429d67d2832e5cb2e49
Parents: f470f68
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Authored: Tue Mar 10 12:25:43 2015 +0300
Committer: nikolay_tikhonov <ntikho...@gridgain.com>
Committed: Tue Mar 10 12:25:43 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/IgniteCache.java | 4 ++--
.../cache/GridCacheAbstractLocalStoreSelfTest.java | 8 ++++----
.../cache/GridCacheAbstractUsersAffinityMapperSelfTest.java | 4 +++-
.../distributed/GridCachePreloadRestartAbstractSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +-
.../near/GridCachePartitionedAffinitySelfTest.java | 1 -
.../near/GridCachePartitionedNodeRestartTest.java | 2 +-
.../GridCachePartitionedOptimisticTxNodeRestartTest.java | 2 +-
8 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 3e199eb..ab5c9f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.lang.*;
@@ -469,7 +469,7 @@ public interface IgniteCache<K, V> extends
javax.cache.Cache<K, V>, IgniteAsyncS
* the left nodes, and that nodes are restarted before
* {@link CacheConfiguration#getRebalancePartitionedDelay()
rebalanceDelay} expires. To place nodes
* on the same place in consistent hash ring, use
- * {@link
CacheConsistentHashAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)}
to make sure that
+ * {@link
CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)}
to make sure that
* a node maps to the same hash ID if re-started.
* <p>
* See {@link CacheConfiguration#getRebalancePartitionedDelay()} for more
information on how to configure
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index c43b8f8..3d7ed58 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.*;
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.*;
/**
@@ -121,7 +121,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest
extends GridCommonAbst
cacheCfg.setAtomicityMode(getAtomicMode());
cacheCfg.setDistributionMode(getDistributionMode());
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
if (gridName.endsWith("1"))
cacheCfg.setCacheStoreFactory(new
FactoryBuilder.SingletonFactory<CacheStore>(LOCAL_STORE_1));
@@ -220,7 +220,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest
extends GridCommonAbst
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_PART_UNLOADED);
+ }, EventType.EVT_CACHE_REBALANCE_PART_UNLOADED);
}
final Ignite ignite2 = startGrid(2);
@@ -314,7 +314,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest
extends GridCommonAbst
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_PART_UNLOADED);
+ }, EventType.EVT_CACHE_REBALANCE_PART_UNLOADED);
}
final Ignite ignite2 = startGrid(2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
index 71f28ce..2d551a1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractUsersAffinityMapperSelfTest.java
@@ -30,6 +30,8 @@ import org.apache.ignite.testframework.junits.common.*;
import java.io.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
+
/**
* Test affinity mapper.
*/
@@ -66,7 +68,7 @@ public abstract class
GridCacheAbstractUsersAffinityMapperSelfTest extends GridC
cacheCfg.setAtomicityMode(getAtomicMode());
cacheCfg.setDistributionMode(getDistributionMode());
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(CachePreloadMode.SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAffinityMapper(AFFINITY_MAPPER);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/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 353f7da..64d3e1f 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
@@ -113,7 +113,7 @@ public abstract class
GridCachePreloadRestartAbstractSelfTest extends GridCommon
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setStartSize(20);
cc.setRebalanceMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
cc.setBackups(backups);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/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 884bbfa..4857bd0 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
@@ -74,7 +74,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends
GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setRebalanceMode(preloadMode);
- cc.setPreloadPartitionedDelay(delay);
+ cc.setRebalancePartitionedDelay(delay);
cc.setAffinity(new CacheRendezvousAffinityFunction(false, 128));
cc.setBackups(1);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git
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
index 58aef90..7f65f80 100644
---
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
@@ -40,7 +40,6 @@ 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.CacheRebalanceMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
import static org.apache.ignite.events.EventType.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --git
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
index d68eb82..a4881f8 100644
---
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
@@ -44,7 +44,7 @@ public class GridCachePartitionedNodeRestartTest extends
GridCacheAbstractNodeRe
cc.setDistributionMode(PARTITIONED_ONLY);
cc.setStartSize(20);
cc.setRebalanceMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
cc.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/026c09a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index 1aed0b7..0986eaf 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -43,7 +43,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest
extends GridCacheAb
cc.setWriteSynchronizationMode(FULL_ASYNC);
cc.setStartSize(20);
cc.setRebalanceMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions));
cc.setBackups(backups);
