ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/50] incubator-ignite git commit: #ignite-683: Remove unused method primaryEntrySetx().
Date Mon, 13 Apr 2015 17:40:00 GMT
#ignite-683: Remove unused method primaryEntrySetx().


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

Branch: refs/heads/ignite-sprint-4
Commit: 6923b4fd4e593934fc81f61c74518101acf39f55
Parents: 7c74714
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Apr 9 18:29:24 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Apr 9 18:29:24 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java     |  8 --------
 .../processors/cache/GridCacheProjectionEx.java         |  8 --------
 .../processors/cache/GridCacheProjectionImpl.java       |  5 -----
 .../internal/processors/cache/GridCacheProxyImpl.java   | 12 ------------
 .../processors/service/GridServiceProcessor.java        |  3 ++-
 5 files changed, 2 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6923b4fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 9eec960..1b8ef16 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -948,14 +948,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public Set<Cache.Entry<K, V>> primaryEntrySetx(CacheEntryPredicate...
filter) {
-        return map.entriesx(
-            F0.and0(
-                filter,
-                CU.cachePrimary(ctx.grid().affinity(ctx.name()), ctx.localNode())));
-    }
-
-    /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> entrySet(int part) {
         throw new UnsupportedOperationException();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6923b4fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
index f00d9d6..20e66e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
@@ -235,14 +235,6 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K,
V> {
     public Set<Cache.Entry<K, V>> entrySetx(CacheEntryPredicate... filter);
 
     /**
-     * Gets set of primary entries containing internal entries.
-     *
-     * @param filter Optional filter.
-     * @return Primary entry set.
-     */
-    public Set<Cache.Entry<K, V>> primaryEntrySetx(CacheEntryPredicate... filter);
-
-    /**
      * @return {@link ExpiryPolicy} associated with this projection.
      */
     public @Nullable ExpiryPolicy expiry();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6923b4fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 30fb4aa..ce46066 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -507,11 +507,6 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public Set<Cache.Entry<K, V>> primaryEntrySetx(CacheEntryPredicate...
filter) {
-        return cache.primaryEntrySetx(filter);
-    }
-
-    /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> entrySet(int part) {
         // TODO pass entry filter.
         return cache.entrySet(part);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6923b4fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 58cb0b0..8746268 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -936,18 +936,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public Set<Cache.Entry<K, V>> primaryEntrySetx(CacheEntryPredicate...
filter) {
-        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
-
-        try {
-            return delegate.primaryEntrySetx(filter);
-        }
-        finally {
-            gate.leave(prev);
-        }
-    }
-
-    /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> primaryEntrySet() {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6923b4fd/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 335f8ac..b6ad484 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -1083,7 +1083,8 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                         }
 
                         // Clean up zombie assignments.
-                        for (Cache.Entry<Object, Object> e : cache.primaryEntrySetx())
{
+                        for (Cache.Entry<Object, Object> e :
+                            cache.entrySetx(CU.cachePrimary(ctx.grid().affinity(cache.name()),
ctx.grid().localNode()))) {
                             if (!(e.getKey() instanceof GridServiceAssignmentsKey))
                                 continue;
 


Mime
View raw message