Ignite-54-55 minor renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a55dab53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a55dab53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a55dab53 Branch: refs/heads/ignite-57 Commit: a55dab53312ce3693e5bce9f2d4a2d84dbd9e0d1 Parents: 6575632 Author: Anton Vinogradov <[email protected]> Authored: Sun Jan 25 21:59:36 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Sun Jan 25 21:59:36 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 4 ++-- .../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 4 ++-- .../cache/distributed/near/GridNearCacheAdapter.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a55dab53/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 aac06cf..952c4de 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 @@ -1150,7 +1150,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * * @return Split runnables. */ - public List<GridCacheClearAllRunnable<K, V>> splitClearAll() { + public List<GridCacheClearAllRunnable<K, V>> splitClearLocally() { assert CLEAR_ALL_SPLIT_THRESHOLD > 0; int keySize = size(); @@ -1181,7 +1181,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, ctx.denyOnFlag(READ); ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); - List<GridCacheClearAllRunnable<K, V>> jobs = splitClearAll(); + List<GridCacheClearAllRunnable<K, V>> jobs = splitClearLocally(); if (!F.isEmpty(jobs)) { ExecutorService execSvc = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a55dab53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 6418e68..56e40ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -884,10 +884,10 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap } /** {@inheritDoc} */ - @Override public List<GridCacheClearAllRunnable<K, V>> splitClearAll() { + @Override public List<GridCacheClearAllRunnable<K, V>> splitClearLocally() { CacheDistributionMode mode = configuration().getDistributionMode(); - return (mode == PARTITIONED_ONLY || mode == NEAR_PARTITIONED) ? super.splitClearAll() : + return (mode == PARTITIONED_ONLY || mode == NEAR_PARTITIONED) ? super.splitClearLocally() : Collections.<GridCacheClearAllRunnable<K, V>>emptyList(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a55dab53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index b01209d..a213fe1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -659,12 +659,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public List<GridCacheClearAllRunnable<K, V>> splitClearAll() { + @Override public List<GridCacheClearAllRunnable<K, V>> splitClearLocally() { switch (configuration().getDistributionMode()) { case NEAR_PARTITIONED: GridCacheVersion obsoleteVer = ctx.versions().next(); - List<GridCacheClearAllRunnable<K, V>> dhtJobs = dht().splitClearAll(); + List<GridCacheClearAllRunnable<K, V>> dhtJobs = dht().splitClearLocally(); List<GridCacheClearAllRunnable<K, V>> res = new ArrayList<>(dhtJobs.size()); @@ -674,7 +674,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda return res; case NEAR_ONLY: - return super.splitClearAll(); + return super.splitClearLocally(); default: assert false : "Invalid partition distribution mode.";
