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 D7678172F4 for ; Wed, 29 Apr 2015 14:30:38 +0000 (UTC) Received: (qmail 9235 invoked by uid 500); 29 Apr 2015 14:30:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9167 invoked by uid 500); 29 Apr 2015 14:30:38 -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 9151 invoked by uid 99); 29 Apr 2015 14:30:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 14:30:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of root@apache.org designates 54.76.25.247 as permitted sender) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 14:30:12 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 589542AB57 for ; Wed, 29 Apr 2015 14:29:21 +0000 (UTC) Received: (qmail 4546 invoked by uid 99); 29 Apr 2015 14:28:03 -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; Wed, 29 Apr 2015 14:28:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 398EDE0215; Wed, 29 Apr 2015 14:28:03 +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: Wed, 29 Apr 2015 14:28:43 -0000 Message-Id: <470f3002c74448d4a4dd0e9048a920fd@git.apache.org> In-Reply-To: <4374faf20c7f4bbda87daf715dec37d2@git.apache.org> References: <4374faf20c7f4bbda87daf715dec37d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/42] incubator-ignite git commit: # ignite-286 X-Virus-Checked: Checked by ClamAV on apache.org # 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/5d5bdee8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d5bdee8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d5bdee8 Branch: refs/heads/ignite-286 Commit: 5d5bdee8cf81ed94e99ca7646ea60dc74b3431d4 Parents: 9cab2af Author: sboikov Authored: Wed Apr 29 17:27:39 2015 +0300 Committer: sboikov Committed: Wed Apr 29 17:27:39 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 40 +++++++++++--------- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/OffHeapTieredTransactionSelfTest.java | 1 - 3 files changed, 24 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d5bdee8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index da4d40b..eb82218 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -1559,7 +1559,9 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { * @return Off-heap iterator. */ public GridCloseableIterator rawOffHeapIterator(final CX2, T2, T> c, - boolean primary, boolean backup) { + boolean primary, + boolean backup) + { assert c != null; if (!offheapEnabled || (!primary && !backup)) @@ -1575,7 +1577,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { Set parts = primary ? cctx.affinity().primaryPartitions(cctx.localNodeId(), ver) : cctx.affinity().backupPartitions(cctx.localNodeId(), ver); - return new ClosablePartitionsIterator(parts) { + return new CloseablePartitionsIterator(parts) { @Override protected GridCloseableIterator partitionIterator(int part) throws IgniteCheckedException { @@ -1589,14 +1591,15 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { * @param backup Include backups. * @return Raw off-heap iterator. */ - public GridCloseableIterator> rawOffHeapIterator(final boolean primary, final boolean backup) { + public GridCloseableIterator> rawOffHeapIterator(final boolean primary, + final boolean backup) + { if (!offheapEnabled || (!primary && !backup)) return new GridEmptyCloseableIterator<>(); if (primary && backup) return new GridCloseableIteratorAdapter>() { - private GridCloseableIterator> it = - offheap.iterator(spaceName); + private GridCloseableIterator> it = offheap.iterator(spaceName); private Map.Entry cur; @@ -1626,7 +1629,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { Set parts = primary ? cctx.affinity().primaryPartitions(cctx.localNodeId(), ver) : cctx.affinity().backupPartitions(cctx.localNodeId(), ver); - return new ClosablePartitionsIterator, IgniteBiTuple>(parts) { + return new CloseablePartitionsIterator, IgniteBiTuple>(parts) { private Map.Entry cur; @Override protected Map.Entry onNext() { @@ -1672,7 +1675,9 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { * @param backup Include backups. * @throws IgniteCheckedException If failed. */ - public GridCloseableIterator> rawSwapIterator(boolean primary, boolean backup) throws IgniteCheckedException { + public GridCloseableIterator> rawSwapIterator(boolean primary, boolean backup) + throws IgniteCheckedException + { if (!swapEnabled || (!primary && !backup)) return new GridEmptyCloseableIterator<>(); @@ -1686,7 +1691,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { Set parts = primary ? cctx.affinity().primaryPartitions(cctx.localNodeId(), ver) : cctx.affinity().backupPartitions(cctx.localNodeId(), ver); - return new ClosablePartitionsIterator, Map.Entry>(parts) { + return new CloseablePartitionsIterator, Map.Entry>(parts) { @Override protected GridCloseableIterator> partitionIterator(int part) throws IgniteCheckedException { @@ -1732,7 +1737,9 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { * @return Offheap entries iterator. * @throws IgniteCheckedException If failed. */ - public Iterator> offheapIterator(boolean primary, boolean backup, AffinityTopologyVersion topVer) + public Iterator> offheapIterator(boolean primary, + boolean backup, + AffinityTopologyVersion topVer) throws IgniteCheckedException { assert primary || backup; @@ -1947,7 +1954,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { /** * */ - private abstract class PartitionsIterator extends PartitionsAbstractIterator> { + private abstract class PartitionsIterator extends PartitionsAbstractIterator> { /** * @param parts Partitions */ @@ -1958,8 +1965,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { /** {@inheritDoc} */ @Override protected Iterator> partitionIterator(int part) throws IgniteCheckedException { - return cacheEntryIterator( - GridCacheSwapManager.this.lazyIterator(nextPartition(part))); + return cacheEntryIterator(GridCacheSwapManager.this.lazyIterator(nextPartition(part))); } /** @@ -2060,7 +2066,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { /** * */ - private abstract class ClosablePartitionsIterator extends GridCloseableIteratorAdapter { + private abstract class CloseablePartitionsIterator extends GridCloseableIteratorAdapter { /** */ private Iterator partIt; @@ -2073,14 +2079,14 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { /** * @param parts Partitions */ - public ClosablePartitionsIterator(Collection parts) { + public CloseablePartitionsIterator(Collection parts) { this.partIt = parts.iterator(); try { advance(); } catch (IgniteCheckedException e) { - e.printStackTrace(); // Should never happen. + throw U.convertException(e); } } @@ -2114,6 +2120,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { /** * Switches to next element. + * @throws IgniteCheckedException If failed. */ private void advance() throws IgniteCheckedException { next = null; @@ -2153,7 +2160,6 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { * @return Iterator for given partition. * @throws IgniteCheckedException If failed. */ - abstract protected GridCloseableIterator partitionIterator(int part) - throws IgniteCheckedException; + abstract protected GridCloseableIterator partitionIterator(int part) throws IgniteCheckedException; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d5bdee8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index e7c4246..16a8028 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -914,9 +914,7 @@ public abstract class GridCacheQueryManager extends GridCacheManagerAdapte throws IgniteCheckedException { IgniteBiPredicate filter = qry.scanFilter(); - Iterator> it; - - it = cctx.swap().rawSwapIterator(true, backups); + Iterator> it = cctx.swap().rawSwapIterator(true, backups); return scanIterator(it, filter, qry.keepPortable()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d5bdee8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffHeapTieredTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffHeapTieredTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffHeapTieredTransactionSelfTest.java index 7af7b5d..671d6c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffHeapTieredTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffHeapTieredTransactionSelfTest.java @@ -86,7 +86,6 @@ public class OffHeapTieredTransactionSelfTest extends GridCommonAbstractTest { * @throws Exception In case of error. */ public void testPutAll() throws Exception { - IgniteCache cache = grid(0).cache(null); final int KEYS = 5;