geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [17/23] incubator-geode git commit: GEODE-1781: repackage internal statistics classes and refactor statistics tests
Date Mon, 15 Aug 2016 18:43:45 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
index cfd1e2b..f4d0144 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
index 12492ad..eef2b77 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
index 5e2dc46..de150ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
index 99fe18a..eb07e69 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
index 2fa5d34..c6b20af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
index b92166d..5f06bbd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
index d3809cf..da66257 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
index c100fbb..dbdd957 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
index ea2d9df..c519d8c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
index 84a5349..63009d2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
index 6ada0c4..d4ef97f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -20,9 +20,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 7013e68..111f4b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
index 2a2cf72..471349b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
index dd883fa..e4c6009 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
index dfffd73..526f0b6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
index 3125dc7..df0e3fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
index 34597bc..3aea96c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
index 81af4b7..02054f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
index 11246db..6a59c75 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
index c2ab62e..f2e31ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
index 2de736b..e24a506 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
index cbaf957..6848f0b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
index 8fe0113..da52cfa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
index 95cf625..2a82e71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
index e5bbaf3..806e5d8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
index eae764f..1e693e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
index 8241c92..df0632c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
index d63f5c4..81aab0c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
index ab9f947..2e6ede7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
index 5862ad5..31ce236 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
@@ -20,9 +20,8 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
index 096d89d..72e3296 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
index e6d0238..8c9ded0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
index 18e767d..8f064f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
index 35eb3ac..1cc7c7b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
index f7bbc3d..53944d8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
@@ -19,9 +19,8 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
index 7e1fcc7..191f792 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
@@ -20,9 +20,8 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapIntKey.java
index 2ef67ae..9713d51 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapIntKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapLongKey.java
index c2dfde0..1898a96 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapLongKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapObjectKey.java
index 8d4df4b..e19d99c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapObjectKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey1.java
index 5c2880b..c75649b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey1.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey2.java
index 11328bb..26265a2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapStringKey2.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
index 0dc152b..e891e60 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
 // macros whose definition changes this class:
 // disk: DISK

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
index 154985d..74ade79 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
index 510686a..4d41a71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
index de82cf1..dc2e1d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
index 6061a5f..1664978 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
index de2556f..4a455d9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache;
 // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
index 72e264c..17e6060 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/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 edf3316..8cd6507 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
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.EntryNotFoundException;
 import com.gemstone.gemfire.cache.TimeoutException;
 import com.gemstone.gemfire.distributed.internal.DM;
 import com.gemstone.gemfire.internal.ByteArrayDataInput;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.DistributedRegion.DiskPosition;
 import com.gemstone.gemfire.internal.cache.InitialImageOperation.Entry;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
index 369046f..6073d92 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
index 4f0a21a..1b00916 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
index 9adc75c..9594e35 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
index 57a49da..72f2472 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
index c278422..cf30631 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
index 8c98440..b0f4e59 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -22,9 +22,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
index ae2acca..9c7bb4a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
index 859980d..189aaea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
index 7c2e6f8..d8d8af3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
index fe69989..5499f8b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
index 6e8651c..5409364 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -21,9 +21,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
index cffd1ef..ebfddd6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -22,9 +22,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.internal.cache.lru.LRUClockNode;
-import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
index 5d087b1..d094ce8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
index d723de6..5281ef5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/866bacec/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
index 61403ed..3d4aa2d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import com.gemstone.gemfire.cache.EntryEvent;
 import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
 import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore;
-import com.gemstone.gemfire.internal.InternalStatisticsDisabledException;
+import com.gemstone.gemfire.internal.statistics.InternalStatisticsDisabledException;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;



Mime
View raw message