Repository: ignite Updated Branches: refs/heads/ignite-1.6 e49522b4e -> f07f988fe
GG-11142 In case cross tx CacheFileLocalStore writes all entries (from different caches) in stores involved in transactions Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f07f988f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f07f988f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f07f988f Branch: refs/heads/ignite-1.6 Commit: f07f988fe5b0b481ba53f4954416544ff63ad6d0 Parents: e49522b Author: Anton Vinogradov <[email protected]> Authored: Tue May 17 16:44:28 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue May 17 16:45:38 2016 +0300 ---------------------------------------------------------------------- .../cache/CrossCacheTxRandomOperationsTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f07f988f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java index 2577d93..67ec371 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java @@ -150,7 +150,7 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest { * @param fairAff If {@code true} uses {@link FairAffinityFunction}, otherwise {@link RendezvousAffinityFunction}. * @return Cache configuration. */ - private CacheConfiguration cacheConfiguration(String name, + protected CacheConfiguration cacheConfiguration(String name, CacheMode cacheMode, CacheWriteSynchronizationMode writeSync, boolean fairAff) { @@ -170,6 +170,13 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest { } /** + */ + protected void createCache(CacheMode cacheMode, CacheWriteSynchronizationMode writeSync, boolean fairAff, + Ignite ignite, String name) { + ignite.createCache(cacheConfiguration(name, cacheMode, writeSync, fairAff)); + } + + /** * @param cacheMode Cache mode. * @param writeSync Write synchronization mode. * @param crossCacheTx If {@code true} uses cross cache transaction. @@ -183,8 +190,8 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest { Ignite ignite = ignite(0); try { - ignite.createCache(cacheConfiguration(CACHE1, cacheMode, writeSync, fairAff)); - ignite.createCache(cacheConfiguration(CACHE2, cacheMode, writeSync, fairAff)); + createCache(cacheMode, writeSync, fairAff, ignite, CACHE1); + createCache(cacheMode, writeSync, fairAff, ignite, CACHE2); txOperations(PESSIMISTIC, REPEATABLE_READ, crossCacheTx, false); txOperations(PESSIMISTIC, REPEATABLE_READ, crossCacheTx, true);
