You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/11/09 23:55:51 UTC

[1/2] incubator-geode git commit: made release method default on interfaces got rid of instanceof on release call

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1895 [created] 2f9ea5e8f


made release method default on interfaces
got rid of instanceof on release call


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/34ba0f38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/34ba0f38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/34ba0f38

Branch: refs/heads/feature/GEODE-1895
Commit: 34ba0f38ad494a7539486c34fedd7ae5daaba39f
Parents: 7973d57
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Nov 9 11:26:11 2016 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Nov 9 15:50:36 2016 -0800

----------------------------------------------------------------------
 .../apache/geode/internal/cache/AbstractDiskRegion.java  | 11 +++--------
 .../apache/geode/internal/cache/OffHeapRegionEntry.java  | 11 +++++++++--
 .../org/apache/geode/internal/cache/RegionEntry.java     |  9 ++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/34ba0f38/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
index 554455d..0bf5842 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
@@ -580,19 +580,14 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
     if (isReadyForRecovery()) {
       ds.updateDiskRegion(this);
       this.entriesMapIncompatible = false;
-      if (this.entries != null) {
+      if (this.entries != null && region.getOffHeap()) {
         CustomEntryConcurrentHashMap<Object, Object> other =
             ((AbstractRegionMap) this.entries)._getMap();
         Iterator<Map.Entry<Object, Object>> it = other.entrySetWithReusableEntries().iterator();
         while (it.hasNext()) {
           Map.Entry<Object, Object> me = it.next();
-          RegionEntry oldRe = (RegionEntry) me.getValue();
-          if (oldRe instanceof OffHeapRegionEntry) {
-            ((OffHeapRegionEntry) oldRe).release();
-          } else {
-            // no need to keep iterating; they are all either off heap or on heap.
-            break;
-          }
+          OffHeapRegionEntry oldRe = (OffHeapRegionEntry) me.getValue();
+          oldRe.release();
         }
       }
       this.entries = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/34ba0f38/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
index 34109f4..83b298a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OffHeapRegionEntry.java
@@ -15,14 +15,15 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.internal.offheap.Releasable;
+import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
+import org.apache.geode.internal.offheap.annotations.Released;
 
 /**
  * Any RegionEntry that is stored off heap must implement this interface.
  * 
  *
  */
-public interface OffHeapRegionEntry extends RegionEntry, Releasable {
+public interface OffHeapRegionEntry extends RegionEntry {
   /**
    * OFF_HEAP_FIELD_READER
    * 
@@ -38,4 +39,10 @@ public interface OffHeapRegionEntry extends RegionEntry, Releasable {
    * @return newAddr OFF_HEAP_ADDRESS
    */
   public boolean setAddress(long expectedAddr, long newAddr);
+  
+  @Override
+  @Released
+  default public void release() {
+    OffHeapRegionEntryHelper.releaseEntry(this);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/34ba0f38/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
index 3448d1f..202d006 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.cache.lru.NewLRUClockHand;
 import org.apache.geode.internal.cache.versions.VersionSource;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.offheap.Releasable;
 import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
@@ -51,7 +52,7 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
  *        volatile long id; DiskStatsLRUEntry extends StatsLRUEntry private volatile long id;
  *
  */
-public interface RegionEntry {
+public interface RegionEntry extends Releasable {
   // Our RegionEntry does not need to keep a reference to the key.
   // It is being referenced by the Map.Entry whose value field
   // references this RegionEntry.
@@ -459,4 +460,10 @@ public interface RegionEntry {
   @Retained(ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE)
   public Object prepareValueForCache(RegionEntryContext r, Object val, EntryEventImpl event,
       boolean isEntryUpdate);
+  
+  @Override
+  default public void release() {
+    // nothing needed by default
+  }
+
 }


[2/2] incubator-geode git commit: Merge branch 'feature/GEODE-1785' into feature/GEODE-1895

Posted by ds...@apache.org.
Merge branch 'feature/GEODE-1785' into feature/GEODE-1895


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2f9ea5e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2f9ea5e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2f9ea5e8

Branch: refs/heads/feature/GEODE-1895
Commit: 2f9ea5e8f22ba5fb9c4e9f39f5dae7c4863e0edc
Parents: 34ba0f3 48808a9
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Nov 9 15:51:35 2016 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Nov 9 15:51:35 2016 -0800

----------------------------------------------------------------------
 dev-tools/generateRegionEntryClasses.sh         |  51 ++
 .../geode/internal/cache/LeafRegionEntry.cpp    | 866 +++++++++++++++++++
 .../VMStatsDiskLRURegionEntryHeapIntKey.java    |   2 +-
 .../VMStatsDiskLRURegionEntryHeapLongKey.java   |   2 +-
 .../VMStatsDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...VMStatsDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...VMStatsDiskLRURegionEntryHeapStringKey2.java |   2 +-
 .../VMStatsDiskLRURegionEntryHeapUUIDKey.java   |   2 +-
 .../VMStatsDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...VMStatsDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../cache/VMStatsDiskRegionEntryHeapIntKey.java |   2 +-
 .../VMStatsDiskRegionEntryHeapLongKey.java      |   2 +-
 .../VMStatsDiskRegionEntryHeapObjectKey.java    |   2 +-
 .../VMStatsDiskRegionEntryHeapStringKey1.java   |   2 +-
 .../VMStatsDiskRegionEntryHeapStringKey2.java   |   2 +-
 .../VMStatsDiskRegionEntryHeapUUIDKey.java      |   2 +-
 .../VMStatsDiskRegionEntryOffHeapIntKey.java    |   2 +-
 .../VMStatsDiskRegionEntryOffHeapLongKey.java   |   2 +-
 .../VMStatsDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...VMStatsDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...VMStatsDiskRegionEntryOffHeapStringKey2.java |   2 +-
 .../VMStatsDiskRegionEntryOffHeapUUIDKey.java   |   2 +-
 .../cache/VMStatsLRURegionEntryHeapIntKey.java  |   2 +-
 .../cache/VMStatsLRURegionEntryHeapLongKey.java |   2 +-
 .../VMStatsLRURegionEntryHeapObjectKey.java     |   2 +-
 .../VMStatsLRURegionEntryHeapStringKey1.java    |   2 +-
 .../VMStatsLRURegionEntryHeapStringKey2.java    |   2 +-
 .../cache/VMStatsLRURegionEntryHeapUUIDKey.java |   2 +-
 .../VMStatsLRURegionEntryOffHeapIntKey.java     |   2 +-
 .../VMStatsLRURegionEntryOffHeapLongKey.java    |   2 +-
 .../VMStatsLRURegionEntryOffHeapObjectKey.java  |   2 +-
 .../VMStatsLRURegionEntryOffHeapStringKey1.java |   2 +-
 .../VMStatsLRURegionEntryOffHeapStringKey2.java |   2 +-
 .../VMStatsLRURegionEntryOffHeapUUIDKey.java    |   2 +-
 .../cache/VMStatsRegionEntryHeapIntKey.java     |   2 +-
 .../cache/VMStatsRegionEntryHeapLongKey.java    |   2 +-
 .../cache/VMStatsRegionEntryHeapObjectKey.java  |   2 +-
 .../cache/VMStatsRegionEntryHeapStringKey1.java |   2 +-
 .../cache/VMStatsRegionEntryHeapStringKey2.java |   2 +-
 .../cache/VMStatsRegionEntryHeapUUIDKey.java    |   2 +-
 .../cache/VMStatsRegionEntryOffHeapIntKey.java  |   2 +-
 .../cache/VMStatsRegionEntryOffHeapLongKey.java |   2 +-
 .../VMStatsRegionEntryOffHeapObjectKey.java     |   2 +-
 .../VMStatsRegionEntryOffHeapStringKey1.java    |   2 +-
 .../VMStatsRegionEntryOffHeapStringKey2.java    |   2 +-
 .../cache/VMStatsRegionEntryOffHeapUUIDKey.java |   2 +-
 .../VMThinDiskLRURegionEntryHeapIntKey.java     |   2 +-
 .../VMThinDiskLRURegionEntryHeapLongKey.java    |   2 +-
 .../VMThinDiskLRURegionEntryHeapObjectKey.java  |   2 +-
 .../VMThinDiskLRURegionEntryHeapStringKey1.java |   2 +-
 .../VMThinDiskLRURegionEntryHeapStringKey2.java |   2 +-
 .../VMThinDiskLRURegionEntryHeapUUIDKey.java    |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapIntKey.java  |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...MThinDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../cache/VMThinDiskRegionEntryHeapIntKey.java  |   2 +-
 .../cache/VMThinDiskRegionEntryHeapLongKey.java |   2 +-
 .../VMThinDiskRegionEntryHeapObjectKey.java     |   2 +-
 .../VMThinDiskRegionEntryHeapStringKey1.java    |   2 +-
 .../VMThinDiskRegionEntryHeapStringKey2.java    |   2 +-
 .../cache/VMThinDiskRegionEntryHeapUUIDKey.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapIntKey.java     |   2 +-
 .../VMThinDiskRegionEntryOffHeapLongKey.java    |   2 +-
 .../VMThinDiskRegionEntryOffHeapObjectKey.java  |   2 +-
 .../VMThinDiskRegionEntryOffHeapStringKey1.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapStringKey2.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapUUIDKey.java    |   2 +-
 .../cache/VMThinLRURegionEntryHeapIntKey.java   |   2 +-
 .../cache/VMThinLRURegionEntryHeapLongKey.java  |   2 +-
 .../VMThinLRURegionEntryHeapObjectKey.java      |   2 +-
 .../VMThinLRURegionEntryHeapStringKey1.java     |   2 +-
 .../VMThinLRURegionEntryHeapStringKey2.java     |   2 +-
 .../cache/VMThinLRURegionEntryHeapUUIDKey.java  |   2 +-
 .../VMThinLRURegionEntryOffHeapIntKey.java      |   2 +-
 .../VMThinLRURegionEntryOffHeapLongKey.java     |   2 +-
 .../VMThinLRURegionEntryOffHeapObjectKey.java   |   2 +-
 .../VMThinLRURegionEntryOffHeapStringKey1.java  |   2 +-
 .../VMThinLRURegionEntryOffHeapStringKey2.java  |   2 +-
 .../VMThinLRURegionEntryOffHeapUUIDKey.java     |   2 +-
 .../cache/VMThinRegionEntryHeapIntKey.java      |   2 +-
 .../cache/VMThinRegionEntryHeapLongKey.java     |   2 +-
 .../cache/VMThinRegionEntryHeapObjectKey.java   |   2 +-
 .../cache/VMThinRegionEntryHeapStringKey1.java  |   2 +-
 .../cache/VMThinRegionEntryHeapStringKey2.java  |   2 +-
 .../cache/VMThinRegionEntryHeapUUIDKey.java     |   2 +-
 .../cache/VMThinRegionEntryOffHeapIntKey.java   |   2 +-
 .../cache/VMThinRegionEntryOffHeapLongKey.java  |   2 +-
 .../VMThinRegionEntryOffHeapObjectKey.java      |   2 +-
 .../VMThinRegionEntryOffHeapStringKey1.java     |   2 +-
 .../VMThinRegionEntryOffHeapStringKey2.java     |   2 +-
 .../cache/VMThinRegionEntryOffHeapUUIDKey.java  |   2 +-
 ...sionedStatsDiskLRURegionEntryHeapIntKey.java |   2 +-
 ...ionedStatsDiskLRURegionEntryHeapLongKey.java |   2 +-
 ...nedStatsDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...edStatsDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...edStatsDiskLRURegionEntryHeapStringKey2.java |   2 +-
 ...ionedStatsDiskLRURegionEntryHeapUUIDKey.java |   2 +-
 ...nedStatsDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...edStatsDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...edStatsDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 ...VersionedStatsDiskRegionEntryHeapIntKey.java |   2 +-
 ...ersionedStatsDiskRegionEntryHeapLongKey.java |   2 +-
 ...sionedStatsDiskRegionEntryHeapObjectKey.java |   2 +-
 ...ionedStatsDiskRegionEntryHeapStringKey1.java |   2 +-
 ...ionedStatsDiskRegionEntryHeapStringKey2.java |   2 +-
 ...ersionedStatsDiskRegionEntryHeapUUIDKey.java |   2 +-
 ...sionedStatsDiskRegionEntryOffHeapIntKey.java |   2 +-
 ...ionedStatsDiskRegionEntryOffHeapLongKey.java |   2 +-
 ...nedStatsDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...edStatsDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...edStatsDiskRegionEntryOffHeapStringKey2.java |   2 +-
 ...ionedStatsDiskRegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedStatsLRURegionEntryHeapIntKey.java |   2 +-
 ...VersionedStatsLRURegionEntryHeapLongKey.java |   2 +-
 ...rsionedStatsLRURegionEntryHeapObjectKey.java |   2 +-
 ...sionedStatsLRURegionEntryHeapStringKey1.java |   2 +-
 ...sionedStatsLRURegionEntryHeapStringKey2.java |   2 +-
 ...VersionedStatsLRURegionEntryHeapUUIDKey.java |   2 +-
 ...rsionedStatsLRURegionEntryOffHeapIntKey.java |   2 +-
 ...sionedStatsLRURegionEntryOffHeapLongKey.java |   2 +-
 ...onedStatsLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...nedStatsLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...nedStatsLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...sionedStatsLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedStatsRegionEntryHeapIntKey.java    |   2 +-
 .../VersionedStatsRegionEntryHeapLongKey.java   |   2 +-
 .../VersionedStatsRegionEntryHeapObjectKey.java |   2 +-
 ...VersionedStatsRegionEntryHeapStringKey1.java |   2 +-
 ...VersionedStatsRegionEntryHeapStringKey2.java |   2 +-
 .../VersionedStatsRegionEntryHeapUUIDKey.java   |   2 +-
 .../VersionedStatsRegionEntryOffHeapIntKey.java |   2 +-
 ...VersionedStatsRegionEntryOffHeapLongKey.java |   2 +-
 ...rsionedStatsRegionEntryOffHeapObjectKey.java |   2 +-
 ...sionedStatsRegionEntryOffHeapStringKey1.java |   2 +-
 ...sionedStatsRegionEntryOffHeapStringKey2.java |   2 +-
 ...VersionedStatsRegionEntryOffHeapUUIDKey.java |   2 +-
 ...rsionedThinDiskLRURegionEntryHeapIntKey.java |   2 +-
 ...sionedThinDiskLRURegionEntryHeapLongKey.java |   2 +-
 ...onedThinDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...nedThinDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...nedThinDiskLRURegionEntryHeapStringKey2.java |   2 +-
 ...sionedThinDiskLRURegionEntryHeapUUIDKey.java |   2 +-
 ...onedThinDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...nedThinDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...dThinDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...nedThinDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedThinDiskRegionEntryHeapIntKey.java |   2 +-
 ...VersionedThinDiskRegionEntryHeapLongKey.java |   2 +-
 ...rsionedThinDiskRegionEntryHeapObjectKey.java |   2 +-
 ...sionedThinDiskRegionEntryHeapStringKey1.java |   2 +-
 ...sionedThinDiskRegionEntryHeapStringKey2.java |   2 +-
 ...VersionedThinDiskRegionEntryHeapUUIDKey.java |   2 +-
 ...rsionedThinDiskRegionEntryOffHeapIntKey.java |   2 +-
 ...sionedThinDiskRegionEntryOffHeapLongKey.java |   2 +-
 ...onedThinDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...nedThinDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...nedThinDiskRegionEntryOffHeapStringKey2.java |   2 +-
 ...sionedThinDiskRegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedThinLRURegionEntryHeapIntKey.java  |   2 +-
 .../VersionedThinLRURegionEntryHeapLongKey.java |   2 +-
 ...ersionedThinLRURegionEntryHeapObjectKey.java |   2 +-
 ...rsionedThinLRURegionEntryHeapStringKey1.java |   2 +-
 ...rsionedThinLRURegionEntryHeapStringKey2.java |   2 +-
 .../VersionedThinLRURegionEntryHeapUUIDKey.java |   2 +-
 ...ersionedThinLRURegionEntryOffHeapIntKey.java |   2 +-
 ...rsionedThinLRURegionEntryOffHeapLongKey.java |   2 +-
 ...ionedThinLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...onedThinLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...onedThinLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...rsionedThinLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedThinRegionEntryHeapIntKey.java     |   2 +-
 .../VersionedThinRegionEntryHeapLongKey.java    |   2 +-
 .../VersionedThinRegionEntryHeapObjectKey.java  |   2 +-
 .../VersionedThinRegionEntryHeapStringKey1.java |   2 +-
 .../VersionedThinRegionEntryHeapStringKey2.java |   2 +-
 .../VersionedThinRegionEntryHeapUUIDKey.java    |   2 +-
 .../VersionedThinRegionEntryOffHeapIntKey.java  |   2 +-
 .../VersionedThinRegionEntryOffHeapLongKey.java |   2 +-
 ...ersionedThinRegionEntryOffHeapObjectKey.java |   2 +-
 ...rsionedThinRegionEntryOffHeapStringKey1.java |   2 +-
 ...rsionedThinRegionEntryOffHeapStringKey2.java |   2 +-
 .../VersionedThinRegionEntryOffHeapUUIDKey.java |   2 +-
 194 files changed, 1109 insertions(+), 192 deletions(-)
----------------------------------------------------------------------