[11/11] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-1' into ignite-56

[sevdokimov]

Merge remote-tracking branch 'remotes/origin/ignite-sprint-1' into ignite-56

Conflicts:
        
modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePortableStoreAbstractSelfTest.java


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

Branch: refs/heads/ignite-56
Commit: b44c9017aba6f290e2bde866c04772877965c040
Parents: cc7ef8e
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Fri Feb 6 13:35:52 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Fri Feb 6 13:35:52 2015 +0300

----------------------------------------------------------------------
 modules/core/src/main/java/org/apache/ignite/IgniteCache.java    | 2 ++
 .../ignite/internal/processors/cache/IgniteCacheProxy.java       | 4 ++++
 .../processors/cache/GridCacheAbstractFullApiSelfTest.java       | 3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b44c9017/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 73cb87a..ce0f4b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -390,6 +390,8 @@ 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/b44c9017/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 b358f77..3bdbcd0 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
@@ -740,6 +740,10 @@ public class IgniteCacheProxy<K, V> extends 
IgniteAsyncSupportAdapter<IgniteCach
         }
     }
 
+    @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/b44c9017/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 179fb60..2f08f3d 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
@@ -1698,8 +1698,7 @@ public abstract class GridCacheAbstractFullApiSelfTest 
extends GridCacheAbstract
 
         assertFalse(cacheAsync.<Boolean>future().get());
 
-        cache.localEvict(Collections.singleton("key2"));
-        cache.clear(Collections.singleton("key3"));
+        cache.localEvict(Arrays.asList("key2"));
 
         // Same checks inside tx.
         IgniteTx tx = inTx ? grid(0).transactions().txStart() : null;