ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/7] incubator-ignite git commit: # ignite-54-55 review
Date Wed, 04 Feb 2015 07:21:15 GMT
# ignite-54-55 review


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

Branch: refs/heads/ignite-54-55
Commit: 2f94792caf9d0c319ac76fca3909a7d5f5610fdf
Parents: 95c4d7d
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 4 10:20:43 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 4 10:20:43 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java     | 6 +++---
 .../internal/processors/cache/GridCacheDeploymentManager.java  | 6 +++---
 .../ignite/internal/processors/cache/IgniteCacheProxy.java     | 1 -
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java       | 6 ------
 .../processors/cache/distributed/near/GridNearAtomicCache.java | 2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f94792c/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 e4d3fa0..d12e341 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
@@ -1273,7 +1273,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      * @return {@code True} if cleared.
      */
     private boolean clearLocally(GridCacheVersion obsoleteVer, K key,
-                                 @Nullable IgnitePredicate<CacheEntry<K, V>>[]
filter) {
+        @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
         try {
             if (ctx.portableEnabled())
                 key = (K)ctx.marshalToPortable(key);
@@ -3406,7 +3406,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
                 }
             } while (ctx.affinity().affinityTopologyVersion() > topVer);
         }
-        catch (ClusterGroupEmptyException ignore) {
+        catch (ClusterGroupEmptyCheckedException ignore) {
             if (log.isDebugEnabled())
                 log.debug("All remote nodes left while cache remove [cacheName=" + name()
+ "]");
         }
@@ -5319,7 +5319,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         /** {@inheritDoc} */
         @Override public Object call() throws Exception {
-            ((IgniteEx) ignite).cachex(cacheName).clearLocally();
+            ((IgniteEx)ignite).cachex(cacheName).clearLocally();
 
             return null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f94792c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index ffc2cfb..41f5f6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -301,10 +301,10 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
         if (log.isDebugEnabled())
             log.debug("Finished searching keys for undeploy [keysCnt=" + keys.size() + ']');
 
-            cache.clearLocally(keys, true);
+        cache.clearLocally(keys, true);
 
-            if (cacheCtx.isNear())
-                cacheCtx.near().dht().clearLocally(keys, true);
+        if (cacheCtx.isNear())
+            cacheCtx.near().dht().clearLocally(keys, true);
 
         GridCacheQueryManager<K, V> qryMgr = cacheCtx.queries();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f94792c/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 72bc0aa..1e3ac93 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
@@ -711,7 +711,6 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter<IgniteCach
 
     /** {@inheritDoc} */
     @Override public void removeAll() {
-        // TODO IGNITE-1.
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f94792c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 004c5c0..3c4a7cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -531,12 +531,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public void removeAll() throws IgniteCheckedException {
-        super.removeAll(); // TODO: IGNITE-?? Fix asynс cleanup
-        //removeAllAsync(filter).get();
-    }
-
-    /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K,
V>>[] filter) {
         return removeAllAsync(keySet(filter), filter);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f94792c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index b4dad66..335f268 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -631,7 +631,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public void removeAll() throws IgniteCheckedException {
-        dht.removeAll(keySet());
+        dht.removeAll();
     }
 
     /** {@inheritDoc} */


Mime
View raw message