Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE07D176D8 for ; Thu, 23 Apr 2015 22:57:23 +0000 (UTC) Received: (qmail 50059 invoked by uid 500); 23 Apr 2015 22:57:23 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50031 invoked by uid 500); 23 Apr 2015 22:57:23 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 49985 invoked by uid 99); 23 Apr 2015 22:57:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 22:57:23 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2015 22:57:18 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 6C4A743EB0 for ; Thu, 23 Apr 2015 22:56:09 +0000 (UTC) Received: (qmail 45923 invoked by uid 99); 23 Apr 2015 22:56:09 -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, 23 Apr 2015 22:56:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE2CDE17F9; Thu, 23 Apr 2015 22:56:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Apr 2015 22:56:55 -0000 Message-Id: In-Reply-To: <2e85f10d65cb4ec49281deb7d959af03@git.apache.org> References: <2e85f10d65cb4ec49281deb7d959af03@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] incubator-ignite git commit: Merge branch 'ignite-286' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-286 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-286' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-286 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24b3c478 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24b3c478 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24b3c478 Branch: refs/heads/ignite-286 Commit: 24b3c47863df57d7364d25aa31a30ef59a4ac65c Parents: 4b133bd 8a0e27c Author: ivasilinets Authored: Thu Apr 23 23:53:29 2015 +0300 Committer: ivasilinets Committed: Thu Apr 23 23:53:29 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 34 +++++ .../processors/cache/local/GridLocalCache.java | 11 +- .../local/atomic/GridLocalAtomicCache.java | 11 +- .../cache/query/GridCacheQueryManager.java | 24 ++- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 153 +++++++++++-------- .../cache/GridCacheAbstractSelfTest.java | 8 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 8 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 13 +- .../IgniteCacheFullApiSelfTestSuite.java | 12 +- 10 files changed, 189 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index b9620bb,36043d8..c497aaf --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@@ -47,9 -48,9 +48,10 @@@ import java.util.concurrent.atomic.* import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; + import static org.apache.ignite.cache.CachePeekMode.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.testframework.GridTestUtils.*; import static org.apache.ignite.transactions.TransactionConcurrency.*;