#ignite-286: add partitions to off-heap processor.iterator(CX2<T2<Long, Integer>, T2<Long, Integer>, T> c).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5df57251 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5df57251 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5df57251 Branch: refs/heads/ignite-286 Commit: 5df57251e08668a4aa311ce3f60f9a2f09261120 Parents: ccad025 Author: ivasilinets <[email protected]> Authored: Mon Apr 27 16:42:23 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Mon Apr 27 16:42:23 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +- .../internal/processors/offheap/GridOffHeapProcessor.java | 5 +++-- .../internal/util/offheap/GridOffHeapPartitionedMap.java | 3 ++- .../internal/util/offheap/unsafe/GridUnsafePartitionedMap.java | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5df57251/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 afc1a31..3edad54 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 @@ -1579,7 +1579,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { checkIteratorQueue(); - return offheap.iterator(spaceName, c); + return offheap.iterator(spaceName, c, cctx.grid().affinity(cctx.name()).allPartitions(cctx.grid().localNode())); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5df57251/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java index 5062b3b..ba09821 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java @@ -282,15 +282,16 @@ public class GridOffHeapProcessor extends GridProcessorAdapter { * * @param spaceName Space name. * @param c Key/value closure. + * @param parts Partitions. * @return Iterator. */ public <T> GridCloseableIterator<T> iterator(@Nullable String spaceName, - CX2<T2<Long, Integer>, T2<Long, Integer>, T> c) { + CX2<T2<Long, Integer>, T2<Long, Integer>, T> c, int[] parts) { assert c != null; GridOffHeapPartitionedMap m = offheap(spaceName); - return m == null ? new GridEmptyCloseableIterator<T>() : m.iterator(c); + return m == null ? new GridEmptyCloseableIterator<T>() : m.iterator(c, parts); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5df57251/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java index 50915ed..7d00ee5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMap.java @@ -197,9 +197,10 @@ public interface GridOffHeapPartitionedMap { * Gets iterator over the whole map. * * @param c Key/value closure. + * @param parts Partitions. * @return Iterator over the whole map. */ - public <T> GridCloseableIterator<T> iterator(CX2<T2<Long, Integer>, T2<Long, Integer>, T> c); + public <T> GridCloseableIterator<T> iterator(CX2<T2<Long, Integer>, T2<Long, Integer>, T> c, int[] parts); /** * Sets callback for when entries are evicted due to memory constraints. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5df57251/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java index f646256..870b4ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafePartitionedMap.java @@ -337,7 +337,7 @@ public class GridUnsafePartitionedMap implements GridOffHeapPartitionedMap { } /** {@inheritDoc} */ - @Override public <T> GridCloseableIterator<T> iterator(final CX2<T2<Long, Integer>, T2<Long, Integer>, T> c) { + @Override public <T> GridCloseableIterator<T> iterator(final CX2<T2<Long, Integer>, T2<Long, Integer>, T> c, final int[] parts0) { assert c != null; return new GridCloseableIteratorAdapter<T>() { @@ -357,8 +357,8 @@ public class GridUnsafePartitionedMap implements GridOffHeapPartitionedMap { private void advance() throws IgniteCheckedException { curIt = null; - while (p < parts) { - curIt = mapFor(p++).iterator(c); + while (p < parts0.length) { + curIt = mapFor(parts0[p++]).iterator(c); if (curIt.hasNext()) return;
