You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/22 19:02:22 UTC

[4/6] incubator-ignite git commit: # ignite-648: iterator

# ignite-648: iterator


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc674a10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc674a10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc674a10

Branch: refs/heads/ignite-648
Commit: dc674a10e87108206f0ec46dd7f6f8445168d383
Parents: 9cdd165
Author: ashutak <as...@gridgain.com>
Authored: Mon Jun 22 17:23:23 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Mon Jun 22 17:23:23 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiSelfTest.java      |  2 +-
 .../multijvm/framework/IgniteCacheProcessProxy.java  | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc674a10/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git 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
index 292773c..75cba54 100644
--- 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
@@ -164,7 +164,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
                 for (Map.Entry<String, CacheConfiguration[]> entry : cacheCfgMap.entrySet()) {
                     Ignite ignite;
-                    
+
                     ignite = IgnitionEx.grid(entry.getKey());
 
                     for (CacheConfiguration cfg : entry.getValue())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc674a10/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
index 6e09286..61cbdc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
@@ -501,7 +501,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> {
 
     /** {@inheritDoc} */
     @Override public <T> T unwrap(final Class<T> clazz) {
-        throw new UnsupportedOperationException("Method cannot be supported because T can be unmarshalliable.");
+        throw new UnsupportedOperationException("Method cannot be supported because T can be unmarshallable.");
     }
 
     /** {@inheritDoc} */
@@ -516,7 +516,18 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> {
 
     /** {@inheritDoc} */
     @Override public Iterator<Entry<K, V>> iterator() {
-        throw new UnsupportedOperationException("Method should be supported.");
+        final Collection<Entry<K, V>> col = (Collection<Entry<K, V>>)compute.call(new IgniteCallable<Object>() {
+            @Override public Object call() throws Exception {
+                Collection res = new ArrayList();
+
+                for (Object o : cache())
+                    res.add(o);
+
+                return res;
+            }
+        });
+
+        return col.iterator();
     }
 
     /** {@inheritDoc} */