comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/58a482cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/58a482cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/58a482cc Branch: refs/heads/feature/GEODE-1464 Commit: 58a482cc6d801b5a275d84a4103b5c842c9fb892 Parents: a6be949 Author: Darrel Schneider <[email protected]> Authored: Wed Jun 1 14:54:02 2016 -0700 Committer: Darrel Schneider <[email protected]> Committed: Wed Jun 1 14:54:02 2016 -0700 ---------------------------------------------------------------------- .../gemstone/gemfire/internal/cache/AbstractRegionEntry.java | 7 +------ .../com/gemstone/gemfire/internal/cache/BucketAdvisor.java | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58a482cc/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java index 937a8d3..00ac1f0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java @@ -415,7 +415,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, ReferenceCountHelper.setReferenceCountOwner(null); return null; } else { - result = OffHeapHelper.copyAndReleaseIfNeeded(result); // sqlf does not dec ref count in this call + result = OffHeapHelper.copyAndReleaseIfNeeded(result); ReferenceCountHelper.setReferenceCountOwner(null); setRecentlyUsed(); return result; @@ -752,7 +752,6 @@ public abstract class AbstractRegionEntry implements RegionEntry, } else { FilterProfile fp = region.getFilterProfile(); - // rdubey: Old value also required for SqlfIndexManager. if (fp != null && ((fp.getCqCount() > 0) || expectedOldValue != null)) { //curValue = getValue(region); can cause deadlock will fault in the value // and will confuse LRU. rdubey. @@ -1395,10 +1394,6 @@ public abstract class AbstractRegionEntry implements RegionEntry, } } } - /** - * soubhik: this method is overridden in sqlf flavor of entries. - * Instead of overriding this method; override areSetValue. - */ protected final void _setValue(Object val) { setValueField(val); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58a482cc/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java index 8726750..7a7705e 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java @@ -205,7 +205,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor { return advisor; } - // For SQLFabric ALTER TABLE that may change colocation public void resetParentAdvisor(int bucketId) { PartitionedRegion colocatedRegion = ColocationHelper .getColocatedRegion(this.pRegion);
