http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 0a988db..2a7be3b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -92,6 +92,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr }); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(cacheCfg); cfg.setCacheSanityCheckEnabled(sanityCheckEnabled());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java index a5b5b9c..adc547c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -287,6 +287,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); lifecycleAwares.add(store.lifecycleAware); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java index f068e6d..8251a6c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java @@ -66,6 +66,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java index aa8521a..513a1dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java @@ -98,6 +98,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); if (cacheMode == PARTITIONED) cacheCfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java index ab2d284..19b4b67 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java @@ -62,6 +62,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java index b0f6cb8..eba365e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -50,6 +50,7 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ + @SuppressWarnings("unchecked") @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -73,6 +74,7 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index cad9ae2..ad60b47 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -96,6 +96,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); cc.setWriteBehindEnabled(true); cc.setWriteBehindFlushFrequency(WRITE_FROM_BEHIND_FLUSH_FREQUENCY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 4c8c063..5b0ce3d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -80,6 +80,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 126dac3..e1e0461 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -79,6 +79,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac ccfg.setCacheStoreFactory(null); ccfg.setReadThrough(false); ccfg.setWriteThrough(false); + ccfg.setLoadPreviousValue(true); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index 81be16c..b1392cd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -80,6 +80,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java index de29b39..e982cd3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java @@ -98,6 +98,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte ccfg.setSwapEnabled(false); ccfg.setQueryIndexEnabled(false); ccfg.setCacheStoreFactory(null); + ccfg.setLoadPreviousValue(true); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java index 991399c..6a5a43f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java @@ -100,8 +100,10 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo storeCalled.set(true); } })); + ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 7ff425c..871d370 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -68,6 +68,8 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst } cfg.setCacheStoreFactory(null); + cfg.setReadThrough(false); + cfg.setWriteThrough(false); cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 32)); cfg.setBackups(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index 228fc71..001c47c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -88,6 +88,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); } else cc.setCacheStoreFactory(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 5ca6ea8..d8c9350 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -32,6 +32,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; /** * Tests transaction during cache preloading. @@ -208,9 +210,9 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setPreloadMode(GridCachePreloadMode.ASYNC); + cfg.setPreloadMode(ASYNC); - cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setCacheStoreFactory(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index f319214..c74103e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -120,6 +120,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 2179151..50d115f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -82,6 +82,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new GridCacheTestStore())); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); } else cacheCfg.setCacheStoreFactory(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java index 7784715..b252439 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheGetStoreErrorSelfTest.java @@ -84,6 +84,7 @@ public class GridCacheGetStoreErrorSelfTest extends GridCommonAbstractTest { cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java index 911cee3..39ff87e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java @@ -87,6 +87,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index ae80d37..b0d9bc0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -92,6 +92,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index a994d4b..5e6fb27 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -107,6 +107,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java index f76ca39..3644f2b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java @@ -62,6 +62,7 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); ccfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java index 2ca7c09..816e879 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java @@ -89,6 +89,7 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest cfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); cfg.setReadThrough(true); cfg.setWriteThrough(true); + cfg.setLoadPreviousValue(true); cfg.setAffinity(new GridCacheModuloAffinityFunction(3, 1)); cfg.setWriteSynchronizationMode(FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java index ed97b3f..664fbd7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java @@ -85,6 +85,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest { cfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cfg.setReadThrough(true); cfg.setWriteThrough(true); + cfg.setLoadPreviousValue(true); cfg.setWriteSynchronizationMode(FULL_SYNC); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index 0e288d8..f7f7400 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -91,6 +91,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cacheCfg.setEvictionPolicy(new GridCacheFifoEvictionPolicy(EVICT_PLC_SIZE)); cacheCfg.setSwapEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index dc5be98..202f0c3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -93,6 +93,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(testStore)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); } else cc.setCacheStoreFactory(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index f219ae2..828a42c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -89,6 +89,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index 3747198..91fd251 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -73,6 +73,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); cfg.setCacheConfiguration(ccfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 1dec50a..fdcfc7f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -84,6 +84,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cacheCfg.setQueryIndexEnabled(false); cfg.setCacheConfiguration(cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index b2df006..88ddf99 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -114,6 +114,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); cc.setWriteBehindEnabled(true); cc.setWriteBehindFlushFrequency(WRITE_FROM_BEHIND_FLUSH_FREQUENCY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/loadtests/hashmap/GridCacheTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/gridgain/loadtests/hashmap/GridCacheTestContext.java index a808118..8eab003 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/hashmap/GridCacheTestContext.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/hashmap/GridCacheTestContext.java @@ -18,6 +18,7 @@ package org.gridgain.loadtests.hashmap; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.store.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; import org.gridgain.grid.kernal.processors.cache.dr.os.*; @@ -27,6 +28,8 @@ import org.gridgain.grid.kernal.processors.cache.query.continuous.*; import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.testframework.junits.*; +import java.util.*; + import static org.gridgain.testframework.junits.GridAbstractTest.*; /** @@ -53,7 +56,10 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { defaultCacheConfiguration(), new GridCacheEventManager<K, V>(), new GridCacheSwapManager<K, V>(false), - new GridCacheStoreManager<K, V>(null, null, new CacheConfiguration()), + new GridCacheStoreManager<K, V>(null, + new IdentityHashMap<CacheStore, ThreadLocal>(), + null, + new CacheConfiguration()), new GridCacheEvictionManager<K, V>(), new GridCacheLocalQueryManager<K, V>(), new GridCacheContinuousQueryManager<K, V>(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java index 81540fc..fb28eae 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -273,6 +273,7 @@ public class GridSwapEvictAllBenchmark { ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); } FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java index 887ae1a..a8f2243 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java @@ -342,8 +342,9 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class); suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class); - //suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); - //suite.addTestSuite(IgniteCacheStoreSessionTest.class); + suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); + suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class); + suite.addTestSuite(IgniteCacheTxStoreSessionTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java index b302aed..5a20372 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -134,6 +134,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); cc.setWriteThrough(true); + cc.setLoadPreviousValue(true); cc.setPreloadMode(SYNC); cc.setSwapEnabled(true); cc.setEvictNearSynchronized(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java index d4f20c6..8e6322f 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -70,6 +70,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); + ccfg.setLoadPreviousValue(true); ccfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setCacheConfiguration(ccfg);
