Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1426 [created] 536f64dfe
removed sqlfAdvisee Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/255ee8c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/255ee8c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/255ee8c1 Branch: refs/heads/feature/GEODE-1426 Commit: 255ee8c153c6b49b9f71c1864ce864e2667c9035 Parents: 1af92d8 Author: Darrel Schneider <dschnei...@pivotal.io> Authored: Fri May 20 16:34:26 2016 -0700 Committer: Darrel Schneider <dschnei...@pivotal.io> Committed: Fri May 20 16:34:26 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/ControllerAdvisor.java | 17 ----------------- .../gemfire/internal/cache/GemFireCacheImpl.java | 13 ------------- .../gemfire/internal/cache/GridAdvisor.java | 5 ----- 3 files changed, 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/255ee8c1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java index ab03d8c..ccc14eb 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java @@ -47,23 +47,6 @@ public class ControllerAdvisor extends GridAdvisor { return advisor; } - /** - * Tell everyone else who we are and find out who they are. - */ - @Override - public final void handshake() { - super.handshake(); - // also inform local SQLFabric advisor if any - final GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); - final DistributionAdvisee sqlfAdvisee; - final DistributionAdvisor sqlfAdvisor; - GridProfile profile = (GridProfile) createProfile(); - if (cache != null && (sqlfAdvisee = cache.getSqlfAdvisee()) != null - && (sqlfAdvisor = sqlfAdvisee.getDistributionAdvisor()) != null) { - sqlfAdvisor.putProfile(profile); - } - } - @Override protected void profileCreated(Profile profile) { super.profileCreated(profile); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/255ee8c1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java index c44f3b7..d5f1acc 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java @@ -363,11 +363,6 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer private boolean sqlfSystem; /** - * SQLFabric's static distribution advisee. - */ - private volatile DistributionAdvisee sqlfAdvisee; - - /** * the list of all cache servers. CopyOnWriteArrayList is used to allow concurrent add, remove and retrieval * operations. It is assumed that the traversal operations on cache servers list vastly outnumber the mutative * operations such as add, remove. @@ -5053,14 +5048,6 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer return this.regionsInDestroy.get(path); } - public DistributionAdvisee getSqlfAdvisee() { - return this.sqlfAdvisee; - } - - public void setSqlfAdvisee(DistributionAdvisee advisee) { - this.sqlfAdvisee = advisee; - } - /** * Mark a node as initialized or not initialized. Used by SQLFabric to avoid creation of buckets or routing of * operations/functions on a node that is still in the DDL replay phase. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/255ee8c1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java index 7c7ac12..fd350a0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java @@ -318,11 +318,6 @@ public abstract class GridAdvisor extends DistributionAdvisor { replyProfiles.add(advisee.getProfile()); } } - final GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); - if (cache != null && !cache.isClosed()) { - handleDistributionAdvisee(cache.getSqlfAdvisee(), removeProfile, false, - replyProfiles); - } } /**
