Ignite-54 clear(cacheVersion, ...) renamed to clearLocally(...
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da5c39e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da5c39e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da5c39e3 Branch: refs/heads/ignite-54 Commit: da5c39e31c5ae256825942bdbe16085806b025b6 Parents: 2ed2b27 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 22 18:04:54 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 22 18:04:54 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da5c39e3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 5e2f0b9..3e18045 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -1145,7 +1145,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** - * Split clear all task into multiple runnables. + * Split clearLocally task into multiple runnables. * * @return Split runnables. */ @@ -1235,7 +1235,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im e.clear(obsoleteVer, readers, null); } catch (IgniteCheckedException ex) { - U.error(log, "Failed to clear entry (will continue to clear other entries): " + e, + U.error(log, "Failed to clearLocally entry (will continue to clearLocally other entries): " + e, ex); } } @@ -1245,12 +1245,12 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im * Clears entry from cache. * * @param obsoleteVer Obsolete version to set. - * @param key Key to clear. + * @param key Key to clearLocally. * @param filter Optional filter. * @return {@code True} if cleared. */ - private boolean clear(GridCacheVersion obsoleteVer, K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private boolean clearLocally(GridCacheVersion obsoleteVer, K key, + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { try { if (ctx.portableEnabled()) key = (K)ctx.marshalToPortable(key); @@ -1260,7 +1260,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im return e != null && e.clear(obsoleteVer, false, filter); } catch (IgniteCheckedException ex) { - U.error(log, "Failed to clear entry for key: " + key, ex); + U.error(log, "Failed to clearLocally entry for key: " + key, ex); } return false; @@ -1293,10 +1293,10 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } catch (ClusterGroupEmptyException ignore) { if (log.isDebugEnabled()) - log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]"); + log.debug("All remote nodes left while cache clearLocally [cacheName=" + name() + "]"); } catch (ComputeTaskTimeoutException e) { - U.warn(log, "Timed out waiting for remote nodes to finish cache clear (consider increasing " + + U.warn(log, "Timed out waiting for remote nodes to finish cache clearLocally (consider increasing " + "'networkTimeout' configuration property) [cacheName=" + name() + "]"); throw e; @@ -3775,12 +3775,12 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } catch (ClusterGroupEmptyException ignore) { if (log.isDebugEnabled()) - log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]"); + log.debug("All remote nodes left while cache clearLocally [cacheName=" + name() + "]"); return primaryOnly ? primarySize() : size(); } catch (ComputeTaskTimeoutException e) { - U.warn(log, "Timed out waiting for remote nodes to finish cache clear (consider increasing " + + U.warn(log, "Timed out waiting for remote nodes to finish cache clearLocally (consider increasing " + "'networkTimeout' configuration property) [cacheName=" + name() + "]"); throw e; @@ -3950,7 +3950,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im /** * Saves future in thread local holder and adds listener - * that will clear holder when future is finished. + * that will clearLocally holder when future is finished. * * @param holder Future holder. * @param fut Future to save. @@ -4118,7 +4118,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im GridCacheVersion obsoleteVer = ctx.versions().next(); for (K k : keys) - clear(obsoleteVer, k, filter); + clearLocally(obsoleteVer, k, filter); } /** @@ -4135,7 +4135,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im ctx.denyOnFlag(READ); ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); - return clear(ctx.versions().next(), key, filter); + return clearLocally(ctx.versions().next(), key, filter); } /**
