Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9C7202009D9 for ; Thu, 19 May 2016 11:37:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9B628160A29; Thu, 19 May 2016 09:37:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4C237160A43 for ; Thu, 19 May 2016 11:37:36 +0200 (CEST) Received: (qmail 40244 invoked by uid 500); 19 May 2016 09:37:35 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 38928 invoked by uid 99); 19 May 2016 09:37:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2016 09:37:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B64EEE05E1; Thu, 19 May 2016 09:37:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 19 May 2016 09:38:08 -0000 Message-Id: <683d343d915e485a97ccb7bbd8be33e5@git.apache.org> In-Reply-To: <5f92691f09ae4a6b98f1a9e14dc4ff17@git.apache.org> References: <5f92691f09ae4a6b98f1a9e14dc4ff17@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [35/43] ignite git commit: GG-11142 In case cross tx CacheFileLocalStore writes all entries (from different caches) in stores involved in transactions archived-at: Thu, 19 May 2016 09:37:37 -0000 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/2d2e935b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d2e935b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d2e935b Branch: refs/heads/ignite-3163 Commit: 2d2e935bda27e7c3b3d60c17fd71fe356702ed62 Parents: a5a446c Author: Anton Vinogradov Authored: Tue May 17 16:44:28 2016 +0300 Committer: Anton Vinogradov Committed: Tue May 17 16:44:28 2016 +0300 ---------------------------------------------------------------------- .../cache/CrossCacheTxRandomOperationsTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d2e935b/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);