ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [11/13] incubator-ignite git commit: # IGNITE-56 Fix some tests.
Date Sun, 08 Feb 2015 19:14:13 GMT
# IGNITE-56 Fix some tests.


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

Branch: refs/heads/ignite-61
Commit: db5e5d362b24782adcfceff4fb4ddf0dfeaa34be
Parents: 32d4dec
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Sun Feb 8 21:48:23 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Sun Feb 8 21:48:23 2015 +0300

----------------------------------------------------------------------
 modules/core/src/main/java/org/apache/ignite/IgniteCache.java    | 2 --
 .../ignite/internal/processors/cache/IgniteCacheProxy.java       | 4 ----
 .../processors/cache/GridCacheAbstractIteratorsSelfTest.java     | 2 +-
 .../distributed/near/GridPartitionedBackupLoadSelfTest.java      | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db5e5d36/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index d6a54fc..f2a917e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -390,8 +390,6 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K,
V>, IgniteAsyncS
     @IgniteAsyncSupported
     @Override public void clear();
 
-    public boolean clear(Collection<K> keys);
-
     /** {@inheritDoc} */
     @IgniteAsyncSupported
     @Override public <T> T invoke(K key, EntryProcessor<K, V, T> entryProcessor,
Object... arguments);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db5e5d36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index fbd0d9c..d335306 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -741,10 +741,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
         }
     }
 
-    @Override public boolean clear(Collection<K> keys) {
-        throw new UnsupportedOperationException();
-    }
-
     /** {@inheritDoc} */
     @Override public <T> T invoke(K key, EntryProcessor<K, V, T> entryProcessor,
Object... args)
         throws EntryProcessorException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db5e5d36/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
index f357441..502194f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java
@@ -97,7 +97,7 @@ public abstract class GridCacheAbstractIteratorsSelfTest extends GridCacheAbstra
      * @throws Exception If failed.
      */
     public void testEntrySetIterator() throws Exception {
-        assert jcache().size() == entryCount();
+        assert jcache().localSize() == entryCount();
 
         int cnt = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db5e5d36/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index 65524fc..104c9c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -114,7 +114,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest
{
             if (grid(i).affinity(null).isBackup(grid(i).localNode(), 1)) {
                 assert cache.localPeek(1, CachePeekMode.ONHEAP) == 1;
 
-                assert cache().clearLocally(1);
+                cache(i).clearLocally(1);
 
                 assert cache.localPeek(1, CachePeekMode.ONHEAP) == null;
 


Mime
View raw message