Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1464 [created] 2e11c08e4
removed afterValueOverflow Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fb3a2c5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fb3a2c5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fb3a2c5d Branch: refs/heads/feature/GEODE-1464 Commit: fb3a2c5d3ac285c9cfe238dd6932ac77773a5267 Parents: 3246e4b Author: Darrel Schneider <[email protected]> Authored: Wed Jun 1 11:13:02 2016 -0700 Committer: Darrel Schneider <[email protected]> Committed: Wed Jun 1 11:13:02 2016 -0700 ---------------------------------------------------------------------- .../internal/cache/AbstractDiskRegionEntry.java | 5 -- .../gemfire/internal/cache/DiskEntry.java | 49 ++++---------------- .../gemstone/gemfire/internal/cache/Oplog.java | 2 - .../internal/cache/ValidatingDiskRegion.java | 3 -- 4 files changed, 10 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb3a2c5d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java index b65b7ad..41cd110 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegionEntry.java @@ -67,9 +67,4 @@ public abstract class AbstractDiskRegionEntry GatewaySenderEventImpl.release(this._getValue()); // OFFHEAP _getValue ok } } - @Override - public void afterValueOverflow(RegionEntryContext context) { - //NO OP - //Overridden in sqlf RegionEntry - } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb3a2c5d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java index c9261d6..9ab2a15 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java @@ -85,13 +85,6 @@ public interface DiskEntry extends RegionEntry { * @param context */ public void handleValueOverflow(RegionEntryContext context); - - /** - * In some cases we need to do something just after we unset the value - * from a DiskEntry that has been moved (i.e. overflowed) to disk. - * @param context - */ - public void afterValueOverflow(RegionEntryContext context); /** * Returns true if the DiskEntry value is equal to {@link Token#DESTROYED}, {@link Token#REMOVED_PHASE1}, or {@link Token#REMOVED_PHASE2}. @@ -967,13 +960,8 @@ public interface DiskEntry extends RegionEntry { // Second, do the stats done for the current recovered value if (re.getRecoveredKeyId() < 0) { if (!entry.isValueNull()) { - try { - entry.handleValueOverflow(region); - entry.setValueWithContext(region, null); // fixes bug 41119 - }finally { - entry.afterValueOverflow(region); - } - + entry.handleValueOverflow(region); + entry.setValueWithContext(region, null); // fixes bug 41119 } dr.incNumOverflowOnDisk(1L); dr.incNumOverflowBytesOnDisk(did.getValueLength()); @@ -1132,12 +1120,8 @@ public interface DiskEntry extends RegionEntry { false)); } else { if (!oldValueWasNull) { - try { - entry.handleValueOverflow(context); - entry.setValueWithContext(context,null); // fixes bug 41119 - }finally { - entry.afterValueOverflow(context); - } + entry.handleValueOverflow(context); + entry.setValueWithContext(context,null); // fixes bug 41119 } } if (entry instanceof LRUEntry) { @@ -1559,13 +1543,8 @@ public interface DiskEntry extends RegionEntry { // do the stats when it is actually written to disk } else { region.updateSizeOnEvict(entry.getKey(), oldSize); - //did.setValueSerializedSize(byteSizeOnDisk); - try { - entry.handleValueOverflow(region); - entry.setValueWithContext(region,null); - }finally { - entry.afterValueOverflow(region); - } + entry.handleValueOverflow(region); + entry.setValueWithContext(region,null); movedValueToDisk = true; change = ((LRUClockNode)entry).updateEntrySize(ccHelper); } @@ -1646,12 +1625,8 @@ public interface DiskEntry extends RegionEntry { dr.incNumOverflowBytesOnDisk(did.getValueLength()); incrementBucketStats(region, 0/*InVM*/, 0/*OnDisk*/, did.getValueLength()); - try { - entry.handleValueOverflow(region); - entry.setValueWithContext(region,null); - }finally { - entry.afterValueOverflow(region); - } + entry.handleValueOverflow(region); + entry.setValueWithContext(region,null); } //See if we the entry we wrote to disk has the same tag @@ -1767,12 +1742,8 @@ public interface DiskEntry extends RegionEntry { dr.incNumOverflowBytesOnDisk(did.getValueLength()); incrementBucketStats(region, 0/*InVM*/, 0/*OnDisk*/, did.getValueLength()); - try { - entry.handleValueOverflow(region); - entry.setValueWithContext(region,null); - }finally { - entry.afterValueOverflow(region); - } + entry.handleValueOverflow(region); + entry.setValueWithContext(region,null); } } catch (RegionClearedException ignore) { // no need to do the op since it was clobbered by a region clear http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb3a2c5d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java index 96f616b..6d0f17a 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java @@ -7088,8 +7088,6 @@ public final class Oplog implements CompactableOplog, Flushable { public void handleValueOverflow(RegionEntryContext context) {throw new IllegalStateException();} @Override - public void afterValueOverflow(RegionEntryContext context) {throw new IllegalStateException();} - @Override public Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate) { throw new IllegalStateException("Should never be called"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb3a2c5d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java index 54133cc..4b3b70d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java @@ -173,9 +173,6 @@ public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStor public void handleValueOverflow(RegionEntryContext context) {throw new IllegalStateException("should never be called");} @Override - public void afterValueOverflow(RegionEntryContext context) {throw new IllegalStateException();} - - @Override public Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate) { throw new IllegalStateException("Should never be called"); }
