ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/5] incubator-ignite git commit: #ignite-758: Remove method GridCache.affinityNode().
Date Wed, 15 Apr 2015 17:00:47 GMT
#ignite-758: Remove method GridCache.affinityNode().


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

Branch: refs/heads/ignite-758
Commit: 64b61ade6d073349a64fd90fcee72f27f3208159
Parents: 852a07d
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Apr 15 18:06:51 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Apr 15 18:06:51 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCache.java     |  5 -----
 .../internal/processors/cache/GridCacheAdapter.java     |  5 -----
 .../internal/processors/cache/GridCacheProxyImpl.java   | 12 ------------
 .../cache/GridCacheAbstractFullApiSelfTest.java         |  2 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java          |  4 ++--
 5 files changed, 3 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64b61ade/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
index 8af5fde..dbcd866 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
@@ -215,9 +215,4 @@ public interface GridCache<K, V> extends CacheProjection<K, V>
{
      * @return Future that will be completed when rebalancing is finished.
      */
     public IgniteInternalFuture<?> forceRepartition();
-
-    /**
-     * @return {@code True} if local node is affinity node.
-     */
-    public boolean affinityNode();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64b61ade/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 71d3c0d..5ba4944 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
@@ -4287,11 +4287,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public boolean affinityNode() {
-        return ctx.affinityNode();
-    }
-
-    /** {@inheritDoc} */
     @Override public boolean isIgfsDataCache() {
         return igfsDataCache;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64b61ade/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 2b968bd..d521659 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
@@ -266,18 +266,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public boolean affinityNode() {
-        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
-
-        try {
-            return cache.affinityNode();
-        }
-        finally {
-            gate.leave(prev);
-        }
-    }
-
-    /** {@inheritDoc} */
     @Override public GridCacheProjectionEx<K, V> forSubjectId(UUID subjId) {
         return delegate.forSubjectId(subjId);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64b61ade/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 952479b..8813e82 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
@@ -3407,7 +3407,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         Collection<String> locKeys = new HashSet<>();
 
-        if (cache.affinityNode()) {
+        if (cache.context().affinityNode()) {
             locKeys.addAll(cache.primaryKeySet());
 
             info("Local keys (primary): " + locKeys);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64b61ade/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 32809e6..72b76d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -665,11 +665,11 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest
{
                     ((IgniteKernal)ig).internalCache(DYNAMIC_CACHE_NAME);
 
                 assertNotNull(cacheAdapter);
-                assertFalse(cacheAdapter.affinityNode());
+                assertFalse(cacheAdapter.context().affinityNode());
                 assertTrue(cacheAdapter.context().isNear());
 
                 try {
-                    IgniteEx grid = (IgniteEx)startGrid(nodeCount() + 1);
+                    IgniteEx grid = startGrid(nodeCount() + 1);
 
                     // Check that new node sees near node.
                     GridDiscoveryManager disco = grid.context().discovery();


Mime
View raw message