Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 b6876f306 -> 9373ed3c3
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java index 3b4c5c2..8568b63 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java @@ -22,7 +22,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.hadoop.fs.v2.IgniteHadoopFileSystem; +import org.apache.ignite.hadoop.fs.v2.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.communication.tcp.*; @@ -37,7 +37,6 @@ import java.util.*; 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.CacheWriteSynchronizationMode.*; import static org.apache.ignite.igfs.IgfsMode.*; @@ -218,7 +217,7 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT dataCacheCfg.setName("partitioned"); dataCacheCfg.setCacheMode(PARTITIONED); - dataCacheCfg.setDistributionMode(PARTITIONED_ONLY); + dataCacheCfg.setNearConfiguration(null); dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC); dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java index 135a488..103834a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java @@ -106,7 +106,7 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setNearConfiguration(null); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java index 1f6a204..2cf4762 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java @@ -91,7 +91,7 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setNearConfiguration(null); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemSecondaryModeSelfTest.java index 3f20070..669e3f8 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemSecondaryModeSelfTest.java @@ -105,7 +105,7 @@ public class IgniteHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstr cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setNearConfiguration(null); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); @@ -167,7 +167,7 @@ public class IgniteHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstr cacheCfg.setName("partitioned"); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cacheCfg.setNearConfiguration(null); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java index 00c1272..efc6f3e 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.cache.hibernate; import org.apache.commons.dbcp.managed.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.jta.*; import org.apache.ignite.configuration.*; import org.h2.jdbcx.*; @@ -92,7 +91,7 @@ public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfT cfg.setTransactionManagerLookupClassName(TestTmLookup.class.getName()); - cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + cfg.setNearConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java index a3173bf..1fb9d66 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -127,7 +127,8 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT cc.setCacheMode(cacheMode()); cc.setAtomicityMode(atomicityMode()); - cc.setDistributionMode(gridName.startsWith("client") ? CLIENT_ONLY : distributionMode()); + // TODO IGNITE-45 +// cc.setDistributionMode(gridName.startsWith("client") ? CLIENT_ONLY : distributionMode()); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); @@ -135,7 +136,6 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT cc.setLoadPreviousValue(true); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); - cc.setEvictNearSynchronized(false); CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index aa408f4..1540f03 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -93,9 +93,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); - cc.setEvictNearSynchronized(false); cc.setAtomicityMode(TRANSACTIONAL); - cc.setDistributionMode(NEAR_PARTITIONED); return cc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java index 6de54ec..9add442 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java @@ -36,7 +36,6 @@ import javax.cache.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.query.Query.*; @@ -95,9 +94,7 @@ public class GridCacheCrossCacheQuerySelfTestNewApi extends GridCommonAbstractTe cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); - cc.setEvictNearSynchronized(false); cc.setAtomicityMode(TRANSACTIONAL); - cc.setDistributionMode(NEAR_PARTITIONED); return cc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 160bdd6..f24349c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -36,7 +36,6 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.configuration.DeploymentMode.*; import static org.apache.ignite.events.EventType.*; @@ -128,10 +127,9 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { cacheCfg.setBackups(1); cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM); cacheCfg.setEvictSynchronized(true); - cacheCfg.setEvictNearSynchronized(true); cacheCfg.setEvictSynchronizedKeyBufferSize(1); cacheCfg.setAtomicityMode(TRANSACTIONAL); - cacheCfg.setDistributionMode(NEAR_PARTITIONED); + cacheCfg.setNearConfiguration(new NearCacheConfiguration()); cacheCfg.setEvictionPolicy(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 4763ffc..7a7ce12 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -88,7 +88,6 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setAtomicityMode(TRANSACTIONAL); - cacheCfg.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(true); cacheCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index 40aacae..0c94fa0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -33,7 +33,6 @@ import java.util.*; 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.*; /** @@ -56,7 +55,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED); - ccfg.setDistributionMode(PARTITIONED_ONLY); + ccfg.setNearConfiguration(null); ccfg.setQueryIndexEnabled(true); ccfg.setBackups(1); ccfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 0b775e9..84d8290 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -64,8 +64,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); - cc.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED); - cc.setEvictNearSynchronized(false); + cc.setNearConfiguration(new NearCacheConfiguration()); cc.setEvictionPolicy(new CacheFifoEvictionPolicy(1000)); cc.setBackups(1); cc.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index d1ba4a2..1d0173a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Tests for fields queries. @@ -38,8 +38,8 @@ public class GridCacheAtomicFieldsQuerySelfTest extends GridCachePartitionedFiel } /** {@inheritDoc} */ - @Override protected CacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; + @Override protected NearCacheConfiguration nearConfiguration() { + return null; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java index 8f0a5fc..06df5b8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java @@ -17,16 +17,14 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheDistributionMode.*; +import org.apache.ignite.configuration.*; /** * Tests for atomic cache with near cache enabled. */ public class GridCacheAtomicNearEnabledFieldsQuerySelfTest extends GridCacheAtomicFieldsQuerySelfTest { /** {@inheritDoc} */ - @Override protected CacheDistributionMode distributionMode() { - return NEAR_PARTITIONED; + @Override protected NearCacheConfiguration nearConfiguration() { + return new NearCacheConfiguration(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index d2952a9..2b5e3ad 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -27,7 +27,6 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** @@ -42,8 +41,8 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi /** * @return Distribution. */ - protected CacheDistributionMode distributionMode() { - return NEAR_PARTITIONED; + protected NearCacheConfiguration nearConfiguration() { + return new NearCacheConfiguration(); } /** {@inheritDoc} */ @@ -55,7 +54,7 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi @Override protected CacheConfiguration cache(@Nullable String name, @Nullable String spiName) { CacheConfiguration cc = super.cache(name, spiName); - cc.setDistributionMode(distributionMode()); + cc.setNearConfiguration(nearConfiguration()); return cc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index 5462836..5217eb5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -78,7 +78,6 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest cc.setBackups(1); cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); - cc.setDistributionMode(NEAR_PARTITIONED); CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index 12e5bf8..e3fc936 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.query.h2.sql; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -39,7 +38,6 @@ import org.h2.jdbc.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -75,7 +73,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { cc.setCacheMode(CacheMode.PARTITIONED); cc.setAtomicityMode(CacheAtomicityMode.ATOMIC); - cc.setDistributionMode(PARTITIONED_ONLY); + cc.setNearConfiguration(null); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setPreloadMode(SYNC); cc.setSwapEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index f296812..5465a91 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -22,24 +22,24 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.jta.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.lifecycle.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import javax.transaction.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support for {@link org.apache.ignite.cache.jta.CacheTmLookup}. + * Test for {@link LifecycleAware} support for {@link CacheTmLookup}. */ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest { /** */ private static final String CACHE_NAME = "cache"; /** */ - private CacheDistributionMode distroMode; + private boolean near; /** */ @@ -68,7 +68,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa ccfg.setCacheMode(PARTITIONED); - ccfg.setDistributionMode(distroMode); + ccfg.setNearConfiguration(near ? new NearCacheConfiguration() : null); ccfg.setCacheMode(CacheMode.PARTITIONED); @@ -93,8 +93,8 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa /** {@inheritDoc} */ @Override public void testLifecycleAware() throws Exception { - for (CacheDistributionMode mode : new CacheDistributionMode[] {PARTITIONED_ONLY, NEAR_PARTITIONED}) { - distroMode = mode; + for (boolean nearEnabled : new boolean[] {true, false}) { + near = nearEnabled; super.testLifecycleAware(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 0f0a93f..29a9fe2 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -240,6 +240,35 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ + @Override public <K, V> IgniteCache<K, V> createCache(CacheConfiguration<K, V> cacheCfg) { + assert g != null; + + return g.createCache(cacheCfg); + } + + /** {@inheritDoc} */ + @Override public <K, V> IgniteCache<K, V> createCache(CacheConfiguration<K, V> cacheCfg, + NearCacheConfiguration<K, V> nearCfg) { + assert g != null; + + return g.createCache(cacheCfg, nearCfg); + } + + /** {@inheritDoc} */ + @Override public <K, V> IgniteCache<K, V> createCache(NearCacheConfiguration<K, V> nearCfg) { + assert g != null; + + return g.createCache(nearCfg); + } + + /** {@inheritDoc} */ + @Override public void destroyCache(String cacheName) { + assert g != null; + + g.destroyCache(cacheName); + } + + /** {@inheritDoc} */ @Override public IgniteTransactions transactions() { assert g != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e4a96c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b9a6f8c..26ca9a7 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -77,8 +77,9 @@ public class IgniteNode implements BenchmarkServer { CacheDistributionMode distroMode = args.distributionMode() == CLIENT_ONLY && !clientMode ? PARTITIONED_ONLY : args.distributionMode(); + // TODO IGNITE-45. + cc.setWriteSynchronizationMode(args.syncMode()); - cc.setDistributionMode(distroMode); if (args.orderMode() != null) cc.setAtomicWriteOrderMode(args.orderMode());
