You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/16 02:20:27 UTC
[77/78] geode git commit: fixup
fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5adb681a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5adb681a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5adb681a
Branch: refs/heads/feature/GEODE-2929
Commit: 5adb681af3b1d641ae30be2aa8705d376785c8fb
Parents: 5abc486
Author: Kirk Lund <kl...@apache.org>
Authored: Mon May 15 18:31:40 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon May 15 18:31:40 2017 -0700
----------------------------------------------------------------------
.../geode/cache/client/internal/AbstractOp.java | 4 +-
.../client/internal/ClientMetadataService.java | 2 +-
.../query/internal/index/HashIndexSet.java | 2 +-
.../internal/DistributionAdvisor.java | 6 +-
.../internal/DistributionMessageObserver.java | 3 +-
.../internal/direct/DirectChannel.java | 5 +-
.../geode/internal/ByteBufferOutputStream.java | 2 +-
.../geode/internal/HeapDataOutputStream.java | 53 ++--
.../geode/internal/NullDataOutputStream.java | 2 +-
.../internal/cache/AbstractLRURegionMap.java | 2 +-
.../geode/internal/cache/AbstractRegionMap.java | 18 +-
.../geode/internal/cache/BucketRegion.java | 2 +-
.../apache/geode/internal/cache/DiskRegion.java | 2 +-
.../geode/internal/cache/EntryEventImpl.java | 4 +-
.../apache/geode/internal/cache/HARegion.java | 2 +-
.../internal/cache/PersistentOplogSet.java | 2 +-
.../geode/internal/cache/RemoteGetMessage.java | 4 +-
.../internal/cache/RemotePutAllMessage.java | 5 +-
.../internal/cache/RemoteRemoveAllMessage.java | 3 +-
.../VMStatsDiskLRURegionEntryHeapIntKey.java | 216 +++++++------
.../VMStatsDiskLRURegionEntryHeapLongKey.java | 213 +++++++------
.../VMStatsDiskLRURegionEntryHeapObjectKey.java | 210 +++++++------
...VMStatsDiskLRURegionEntryHeapStringKey1.java | 239 +++++++-------
...VMStatsDiskLRURegionEntryHeapStringKey2.java | 239 +++++++-------
.../VMStatsDiskLRURegionEntryHeapUUIDKey.java | 213 +++++++------
.../VMStatsDiskLRURegionEntryOffHeapIntKey.java | 258 ++++++++--------
...VMStatsDiskLRURegionEntryOffHeapLongKey.java | 255 ++++++++-------
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 250 ++++++++-------
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 279 +++++++++--------
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 279 +++++++++--------
...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java | 255 ++++++++-------
.../cache/VMStatsDiskRegionEntryHeapIntKey.java | 172 ++++++-----
.../VMStatsDiskRegionEntryHeapLongKey.java | 169 +++++-----
.../VMStatsDiskRegionEntryHeapObjectKey.java | 163 +++++-----
.../VMStatsDiskRegionEntryHeapStringKey1.java | 192 ++++++------
.../VMStatsDiskRegionEntryHeapStringKey2.java | 192 ++++++------
.../VMStatsDiskRegionEntryHeapUUIDKey.java | 169 +++++-----
.../VMStatsDiskRegionEntryOffHeapIntKey.java | 206 +++++++------
.../VMStatsDiskRegionEntryOffHeapLongKey.java | 203 ++++++------
.../VMStatsDiskRegionEntryOffHeapObjectKey.java | 200 ++++++------
...VMStatsDiskRegionEntryOffHeapStringKey1.java | 229 +++++++-------
...VMStatsDiskRegionEntryOffHeapStringKey2.java | 229 +++++++-------
.../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 203 ++++++------
.../cache/VMStatsLRURegionEntryHeapIntKey.java | 123 ++++----
.../cache/VMStatsLRURegionEntryHeapLongKey.java | 120 +++----
.../VMStatsLRURegionEntryHeapObjectKey.java | 113 ++++---
.../VMStatsLRURegionEntryHeapStringKey1.java | 141 +++++----
.../VMStatsLRURegionEntryHeapStringKey2.java | 141 +++++----
.../cache/VMStatsLRURegionEntryHeapUUIDKey.java | 113 ++++---
.../VMStatsLRURegionEntryOffHeapIntKey.java | 162 +++++-----
.../VMStatsLRURegionEntryOffHeapLongKey.java | 159 +++++-----
.../VMStatsLRURegionEntryOffHeapObjectKey.java | 154 ++++-----
.../VMStatsLRURegionEntryOffHeapStringKey1.java | 183 ++++++-----
.../VMStatsLRURegionEntryOffHeapStringKey2.java | 183 ++++++-----
.../VMStatsLRURegionEntryOffHeapUUIDKey.java | 152 ++++-----
.../cache/VMStatsRegionEntryHeapIntKey.java | 76 ++---
.../cache/VMStatsRegionEntryHeapLongKey.java | 73 +++--
.../cache/VMStatsRegionEntryHeapObjectKey.java | 66 ++--
.../cache/VMStatsRegionEntryHeapStringKey1.java | 94 +++---
.../cache/VMStatsRegionEntryHeapStringKey2.java | 94 +++---
.../cache/VMStatsRegionEntryHeapUUIDKey.java | 66 ++--
.../cache/VMStatsRegionEntryOffHeapIntKey.java | 108 ++++---
.../cache/VMStatsRegionEntryOffHeapLongKey.java | 105 ++++---
.../VMStatsRegionEntryOffHeapObjectKey.java | 98 +++---
.../VMStatsRegionEntryOffHeapStringKey1.java | 126 ++++----
.../VMStatsRegionEntryOffHeapStringKey2.java | 126 ++++----
.../cache/VMStatsRegionEntryOffHeapUUIDKey.java | 98 +++---
.../VMThinDiskLRURegionEntryHeapIntKey.java | 187 +++++------
.../VMThinDiskLRURegionEntryHeapLongKey.java | 184 +++++------
.../VMThinDiskLRURegionEntryHeapObjectKey.java | 177 ++++++-----
.../VMThinDiskLRURegionEntryHeapStringKey1.java | 208 +++++++------
.../VMThinDiskLRURegionEntryHeapStringKey2.java | 208 +++++++------
.../VMThinDiskLRURegionEntryHeapUUIDKey.java | 184 +++++------
.../VMThinDiskLRURegionEntryOffHeapIntKey.java | 227 +++++++-------
.../VMThinDiskLRURegionEntryOffHeapLongKey.java | 224 +++++++-------
...MThinDiskLRURegionEntryOffHeapObjectKey.java | 219 ++++++-------
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 248 ++++++++-------
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 248 ++++++++-------
.../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 224 +++++++-------
.../cache/VMThinDiskRegionEntryHeapIntKey.java | 146 +++++----
.../cache/VMThinDiskRegionEntryHeapLongKey.java | 147 +++++----
.../VMThinDiskRegionEntryHeapObjectKey.java | 139 ++++-----
.../VMThinDiskRegionEntryHeapStringKey1.java | 168 +++++-----
.../VMThinDiskRegionEntryHeapStringKey2.java | 168 +++++-----
.../cache/VMThinDiskRegionEntryHeapUUIDKey.java | 147 +++++----
.../VMThinDiskRegionEntryOffHeapIntKey.java | 176 +++++------
.../VMThinDiskRegionEntryOffHeapLongKey.java | 177 ++++++-----
.../VMThinDiskRegionEntryOffHeapObjectKey.java | 172 +++++------
.../VMThinDiskRegionEntryOffHeapStringKey1.java | 201 ++++++------
.../VMThinDiskRegionEntryOffHeapStringKey2.java | 201 ++++++------
.../VMThinDiskRegionEntryOffHeapUUIDKey.java | 177 ++++++-----
.../cache/VMThinLRURegionEntryHeapIntKey.java | 94 +++---
.../cache/VMThinLRURegionEntryHeapLongKey.java | 91 +++---
.../VMThinLRURegionEntryHeapObjectKey.java | 84 ++---
.../VMThinLRURegionEntryHeapStringKey1.java | 112 +++----
.../VMThinLRURegionEntryHeapStringKey2.java | 112 +++----
.../cache/VMThinLRURegionEntryHeapUUIDKey.java | 84 ++---
.../VMThinLRURegionEntryOffHeapIntKey.java | 133 ++++----
.../VMThinLRURegionEntryOffHeapLongKey.java | 130 ++++----
.../VMThinLRURegionEntryOffHeapObjectKey.java | 123 ++++----
.../VMThinLRURegionEntryOffHeapStringKey1.java | 152 ++++-----
.../VMThinLRURegionEntryOffHeapStringKey2.java | 152 ++++-----
.../VMThinLRURegionEntryOffHeapUUIDKey.java | 123 ++++----
.../cache/VMThinRegionEntryHeapIntKey.java | 47 ++-
.../cache/VMThinRegionEntryHeapLongKey.java | 44 ++-
.../cache/VMThinRegionEntryHeapObjectKey.java | 37 +--
.../cache/VMThinRegionEntryHeapStringKey1.java | 65 ++--
.../cache/VMThinRegionEntryHeapStringKey2.java | 65 ++--
.../cache/VMThinRegionEntryHeapUUIDKey.java | 37 +--
.../cache/VMThinRegionEntryOffHeapIntKey.java | 79 +++--
.../cache/VMThinRegionEntryOffHeapLongKey.java | 76 +++--
.../VMThinRegionEntryOffHeapObjectKey.java | 69 ++---
.../VMThinRegionEntryOffHeapStringKey1.java | 97 +++---
.../VMThinRegionEntryOffHeapStringKey2.java | 97 +++---
.../cache/VMThinRegionEntryOffHeapUUIDKey.java | 69 +++--
...sionedStatsDiskLRURegionEntryHeapIntKey.java | 261 ++++++++--------
...ionedStatsDiskLRURegionEntryHeapLongKey.java | 258 +++++++++-------
...nedStatsDiskLRURegionEntryHeapObjectKey.java | 252 ++++++++-------
...edStatsDiskLRURegionEntryHeapStringKey1.java | 281 +++++++++--------
...edStatsDiskLRURegionEntryHeapStringKey2.java | 281 +++++++++--------
...ionedStatsDiskLRURegionEntryHeapUUIDKey.java | 258 +++++++++-------
...nedStatsDiskLRURegionEntryOffHeapIntKey.java | 289 +++++++++--------
...edStatsDiskLRURegionEntryOffHeapLongKey.java | 286 +++++++++--------
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 280 +++++++++--------
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 309 +++++++++++--------
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 309 +++++++++++--------
...edStatsDiskLRURegionEntryOffHeapUUIDKey.java | 286 +++++++++--------
...VersionedStatsDiskRegionEntryHeapIntKey.java | 220 ++++++-------
...ersionedStatsDiskRegionEntryHeapLongKey.java | 217 ++++++-------
...sionedStatsDiskRegionEntryHeapObjectKey.java | 211 ++++++-------
...ionedStatsDiskRegionEntryHeapStringKey1.java | 240 +++++++-------
...ionedStatsDiskRegionEntryHeapStringKey2.java | 240 +++++++-------
...ersionedStatsDiskRegionEntryHeapUUIDKey.java | 217 ++++++-------
...sionedStatsDiskRegionEntryOffHeapIntKey.java | 251 +++++++--------
...ionedStatsDiskRegionEntryOffHeapLongKey.java | 248 ++++++++-------
...nedStatsDiskRegionEntryOffHeapObjectKey.java | 242 ++++++++-------
...edStatsDiskRegionEntryOffHeapStringKey1.java | 271 ++++++++--------
...edStatsDiskRegionEntryOffHeapStringKey2.java | 271 ++++++++--------
...ionedStatsDiskRegionEntryOffHeapUUIDKey.java | 248 ++++++++-------
.../VersionedStatsLRURegionEntryHeapIntKey.java | 165 +++++-----
...VersionedStatsLRURegionEntryHeapLongKey.java | 162 +++++-----
...rsionedStatsLRURegionEntryHeapObjectKey.java | 155 +++++-----
...sionedStatsLRURegionEntryHeapStringKey1.java | 183 ++++++-----
...sionedStatsLRURegionEntryHeapStringKey2.java | 183 ++++++-----
...VersionedStatsLRURegionEntryHeapUUIDKey.java | 155 ++++++----
...rsionedStatsLRURegionEntryOffHeapIntKey.java | 193 ++++++------
...sionedStatsLRURegionEntryOffHeapLongKey.java | 193 ++++++------
...onedStatsLRURegionEntryOffHeapObjectKey.java | 186 ++++++-----
...nedStatsLRURegionEntryOffHeapStringKey1.java | 214 +++++++------
...nedStatsLRURegionEntryOffHeapStringKey2.java | 214 +++++++------
...sionedStatsLRURegionEntryOffHeapUUIDKey.java | 186 ++++++-----
.../VersionedStatsRegionEntryHeapIntKey.java | 128 ++++----
.../VersionedStatsRegionEntryHeapLongKey.java | 125 ++++----
.../VersionedStatsRegionEntryHeapObjectKey.java | 121 ++++----
...VersionedStatsRegionEntryHeapStringKey1.java | 149 ++++-----
...VersionedStatsRegionEntryHeapStringKey2.java | 149 ++++-----
.../VersionedStatsRegionEntryHeapUUIDKey.java | 118 ++++---
.../VersionedStatsRegionEntryOffHeapIntKey.java | 158 +++++-----
...VersionedStatsRegionEntryOffHeapLongKey.java | 155 +++++-----
...rsionedStatsRegionEntryOffHeapObjectKey.java | 149 ++++-----
...sionedStatsRegionEntryOffHeapStringKey1.java | 177 ++++++-----
...sionedStatsRegionEntryOffHeapStringKey2.java | 177 ++++++-----
...VersionedStatsRegionEntryOffHeapUUIDKey.java | 148 ++++-----
...rsionedThinDiskLRURegionEntryHeapIntKey.java | 227 +++++++-------
...sionedThinDiskLRURegionEntryHeapLongKey.java | 227 +++++++-------
...onedThinDiskLRURegionEntryHeapObjectKey.java | 221 ++++++-------
...nedThinDiskLRURegionEntryHeapStringKey1.java | 250 ++++++++-------
...nedThinDiskLRURegionEntryHeapStringKey2.java | 250 ++++++++-------
...sionedThinDiskLRURegionEntryHeapUUIDKey.java | 227 +++++++-------
...onedThinDiskLRURegionEntryOffHeapIntKey.java | 258 ++++++++--------
...nedThinDiskLRURegionEntryOffHeapLongKey.java | 255 ++++++++-------
...dThinDiskLRURegionEntryOffHeapObjectKey.java | 249 ++++++++-------
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 278 +++++++++--------
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 278 +++++++++--------
...nedThinDiskLRURegionEntryOffHeapUUIDKey.java | 255 ++++++++-------
.../VersionedThinDiskRegionEntryHeapIntKey.java | 185 ++++++-----
...VersionedThinDiskRegionEntryHeapLongKey.java | 182 ++++++-----
...rsionedThinDiskRegionEntryHeapObjectKey.java | 176 ++++++-----
...sionedThinDiskRegionEntryHeapStringKey1.java | 207 +++++++------
...sionedThinDiskRegionEntryHeapStringKey2.java | 207 +++++++------
...VersionedThinDiskRegionEntryHeapUUIDKey.java | 182 ++++++-----
...rsionedThinDiskRegionEntryOffHeapIntKey.java | 215 +++++++------
...sionedThinDiskRegionEntryOffHeapLongKey.java | 215 ++++++-------
...onedThinDiskRegionEntryOffHeapObjectKey.java | 209 +++++++------
...nedThinDiskRegionEntryOffHeapStringKey1.java | 238 +++++++-------
...nedThinDiskRegionEntryOffHeapStringKey2.java | 238 +++++++-------
...sionedThinDiskRegionEntryOffHeapUUIDKey.java | 215 ++++++-------
.../VersionedThinLRURegionEntryHeapIntKey.java | 134 ++++----
.../VersionedThinLRURegionEntryHeapLongKey.java | 131 ++++----
...ersionedThinLRURegionEntryHeapObjectKey.java | 124 ++++----
...rsionedThinLRURegionEntryHeapStringKey1.java | 152 ++++-----
...rsionedThinLRURegionEntryHeapStringKey2.java | 152 ++++-----
.../VersionedThinLRURegionEntryHeapUUIDKey.java | 124 ++++----
...ersionedThinLRURegionEntryOffHeapIntKey.java | 162 +++++-----
...rsionedThinLRURegionEntryOffHeapLongKey.java | 159 +++++-----
...ionedThinLRURegionEntryOffHeapObjectKey.java | 155 +++++-----
...onedThinLRURegionEntryOffHeapStringKey1.java | 183 ++++++-----
...onedThinLRURegionEntryOffHeapStringKey2.java | 183 ++++++-----
...rsionedThinLRURegionEntryOffHeapUUIDKey.java | 152 ++++-----
.../VersionedThinRegionEntryHeapIntKey.java | 87 +++---
.../VersionedThinRegionEntryHeapLongKey.java | 84 +++--
.../VersionedThinRegionEntryHeapObjectKey.java | 78 +++--
.../VersionedThinRegionEntryHeapStringKey1.java | 106 ++++---
.../VersionedThinRegionEntryHeapStringKey2.java | 106 ++++---
.../VersionedThinRegionEntryHeapUUIDKey.java | 77 +++--
.../VersionedThinRegionEntryOffHeapIntKey.java | 115 ++++---
.../VersionedThinRegionEntryOffHeapLongKey.java | 112 ++++---
...ersionedThinRegionEntryOffHeapObjectKey.java | 106 +++----
...rsionedThinRegionEntryOffHeapStringKey1.java | 134 ++++----
...rsionedThinRegionEntryOffHeapStringKey2.java | 134 ++++----
.../VersionedThinRegionEntryOffHeapUUIDKey.java | 105 ++++---
.../cache/execute/AbstractExecution.java | 3 +-
.../partitioned/BecomePrimaryBucketMessage.java | 4 +-
.../partitioned/EndBucketCreationMessage.java | 4 +-
.../internal/cache/partitioned/GetMessage.java | 4 +-
.../cache/partitioned/IndexCreationMsg.java | 2 +-
.../cache/partitioned/InterestEventMessage.java | 4 +-
.../cache/partitioned/PRTombstoneMessage.java | 4 +-
.../wan/serial/SerialGatewaySenderQueue.java | 4 +-
.../statistics/AbstractStatisticsFactory.java | 16 +-
.../CustomEntryConcurrentHashMap.java | 80 ++---
.../management/internal/OpenTypeConverter.java | 3 +-
.../configuration/domain/CacheElement.java | 4 +-
.../internal/configuration/utils/XmlUtils.java | 6 +-
.../org/apache/geode/redis/internal/Coder.java | 31 +-
.../cache/query/internal/cq/CqConflatable.java | 2 +-
226 files changed, 17698 insertions(+), 16100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index ed0b82c..593375e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -323,8 +323,8 @@ public abstract class AbstractOp implements Op {
* @throws Exception if response could not be processed or we received a response with a server
* exception.
*/
- protected void processChunkedResponse(ChunkedMessage msg, String opName,
- ChunkHandler callback) throws Exception {
+ protected void processChunkedResponse(ChunkedMessage msg, String opName, ChunkHandler callback)
+ throws Exception {
msg.readHeader();
final int msgType = msg.getMessageType();
if (msgType == MessageType.RESPONSE) {
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 1783e2f..4b6d83b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -539,7 +539,7 @@ public class ClientMetadataService {
}
}
- void getClientPRMetadata(LocalRegion region ) {
+ void getClientPRMetadata(LocalRegion region) {
final String regionFullPath = region.getFullPath();
ClientPartitionAdvisor advisor = null;
InternalPool pool = region.getServerProxy().getPool();
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
index d7304ea..361690a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
@@ -658,7 +658,7 @@ public class HashIndexSet implements Set {
/**
* After insert, allows for calculating metadata
*/
- protected final void postInsertHook(boolean usedFreeSlot) {
+ protected void postInsertHook(boolean usedFreeSlot) {
if (usedFreeSlot) {
hashIndexSetProperties.free--;
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index 10c187c..4eb9888 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
@@ -732,7 +732,7 @@ public class DistributionAdvisor {
* @return the current membership version for this advisor
* @since GemFire 5.1
*/
- public final synchronized long startOperation() {
+ public synchronized long startOperation() {
if (logger.isTraceEnabled(LogMarker.DISTRIBUTION_STATE_FLUSH_OP)) {
logger.trace(LogMarker.DISTRIBUTION_STATE_FLUSH_OP,
"startOperation() op count is now {} in view version {}", currentVersionOpCount + 1,
@@ -1622,8 +1622,8 @@ public class DistributionAdvisor {
* @param removeProfile true to remove profile else add profile
* @param exchangeProfiles true to add the profile to reply
*/
- protected void handleDistributionAdvisee(DistributionAdvisee advisee,
- boolean removeProfile, boolean exchangeProfiles, final List<Profile> replyProfiles) {
+ protected void handleDistributionAdvisee(DistributionAdvisee advisee, boolean removeProfile,
+ boolean exchangeProfiles, final List<Profile> replyProfiles) {
final DistributionAdvisor da;
if (advisee != null && (da = advisee.getDistributionAdvisor()) != null) {
if (removeProfile) {
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
index d48a689..f84bee9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
@@ -30,8 +30,7 @@ public abstract class DistributionMessageObserver {
* @param instance
* @return the old observer, or null if there was no old observer.
*/
- public static DistributionMessageObserver setInstance(
- DistributionMessageObserver instance) {
+ public static DistributionMessageObserver setInstance(DistributionMessageObserver instance) {
DistributionMessageObserver oldInstance = DistributionMessageObserver.instance;
DistributionMessageObserver.instance = instance;
return oldInstance;
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index a8dec5d..97519e3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -231,9 +231,8 @@ public class DirectChannel {
* @throws ConnectExceptions if message could not be send to its <code>destination</code>
* @throws NotSerializableException If the msg cannot be serialized
*/
- private int sendToOne(final MembershipManager mgr,
- InternalDistributedMember[] p_destinations, final DistributionMessage msg,
- long ackWaitThreshold, long ackSAThreshold)
+ private int sendToOne(final MembershipManager mgr, InternalDistributedMember[] p_destinations,
+ final DistributionMessage msg, long ackWaitThreshold, long ackSAThreshold)
throws ConnectExceptions, NotSerializableException {
return sendToMany(mgr, p_destinations, msg, ackWaitThreshold, ackSAThreshold);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
index 10685ed..4773229 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
@@ -62,7 +62,7 @@ public class ByteBufferOutputStream extends OutputStream {
/** override OutputStream's write() */
@Override
- public final void write(byte[] source, int offset, int len) {
+ public void write(byte[] source, int offset, int len) {
try {
// System.out.println("writing len="+len + " cap=" + buffer.capacity() + "
// pos="+buffer.position());
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index 7042a85..ae28120 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -355,7 +355,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Prepare the contents for sending again
*/
- public final void rewind() {
+ public void rewind() {
finishWriting();
this.size = 0;
if (this.chunks != null) {
@@ -368,7 +368,7 @@ public class HeapDataOutputStream extends OutputStream
size += this.buffer.remaining();
}
- public void reset() {
+ public void reset() {
this.size = 0;
if (this.chunks != null) {
this.chunks.clear();
@@ -425,7 +425,7 @@ public class HeapDataOutputStream extends OutputStream
* gets the contents of this stream as s ByteBuffer, ready for reading. The stream should not be
* written to past this point until it has been reset.
*/
- public ByteBuffer toByteBuffer() {
+ public ByteBuffer toByteBuffer() {
finishWriting();
consolidateChunks();
return this.buffer;
@@ -435,7 +435,7 @@ public class HeapDataOutputStream extends OutputStream
* gets the contents of this stream as a byte[]. The stream should not be written to past this
* point until it has been reset.
*/
- public byte[] toByteArray() {
+ public byte[] toByteArray() {
ByteBuffer bb = toByteBuffer();
if (bb.hasArray() && bb.arrayOffset() == 0 && bb.limit() == bb.capacity()) {
return bb.array();
@@ -484,7 +484,7 @@ public class HeapDataOutputStream extends OutputStream
* @return the number of bytes written, possibly zero.
* @throws IOException if channel is closed, not yet connected, or some other I/O error occurs.
*/
- public int sendTo(SocketChannel chan) throws IOException {
+ public int sendTo(SocketChannel chan) throws IOException {
finishWriting();
if (size() == 0) {
return 0;
@@ -502,7 +502,7 @@ public class HeapDataOutputStream extends OutputStream
return result;
}
- public void sendTo(SocketChannel chan, ByteBuffer out) throws IOException {
+ public void sendTo(SocketChannel chan, ByteBuffer out) throws IOException {
finishWriting();
if (size() == 0) {
return;
@@ -521,8 +521,7 @@ public class HeapDataOutputStream extends OutputStream
* sends the data from "in" by writing it to "sc" through "out" (out is used to chunk to data and
* is probably a direct memory buffer).
*/
- private void sendChunkTo(ByteBuffer in, SocketChannel sc, ByteBuffer out)
- throws IOException {
+ private void sendChunkTo(ByteBuffer in, SocketChannel sc, ByteBuffer out) throws IOException {
int bytesSent = in.remaining();
if (in.isDirect()) {
flushBuffer(sc, out);
@@ -570,7 +569,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @throws BufferOverflowException if out is not large enough to contain all of our data.
*/
- public void sendTo(ByteBuffer out) {
+ public void sendTo(ByteBuffer out) {
finishWriting();
if (out.remaining() < size()) {
throw new BufferOverflowException();
@@ -597,7 +596,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write the contents of this stream to the specified stream using outBuf if a buffer is needed.
*/
- public void sendTo(OutputStream out, ByteBuffer outBuf) throws IOException {
+ public void sendTo(OutputStream out, ByteBuffer outBuf) throws IOException {
finishWriting();
if (this.chunks != null) {
for (ByteBuffer bb : this.chunks) {
@@ -655,7 +654,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Write the contents of this stream to the specified stream.
*/
- public void sendTo(ByteBufferWriter out) {
+ public void sendTo(ByteBufferWriter out) {
finishWriting();
if (this.chunks != null) {
for (ByteBuffer bb : this.chunks) {
@@ -677,7 +676,7 @@ public class HeapDataOutputStream extends OutputStream
* Returns an input stream that can be used to read the contents that where written to this output
* stream.
*/
- public InputStream getInputStream() {
+ public InputStream getInputStream() {
return new HDInputStream();
}
@@ -802,7 +801,7 @@ public class HeapDataOutputStream extends OutputStream
* Note this implementation is exactly the same as writeTo(OutputStream) but they do not both
* implement a common interface.
*/
- public void sendTo(DataOutput out) throws IOException {
+ public void sendTo(DataOutput out) throws IOException {
finishWriting();
if (this.chunks != null) {
for (ByteBuffer bb : this.chunks) {
@@ -847,7 +846,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the boolean to be written.
*/
- public void writeBoolean(boolean v) {
+ public void writeBoolean(boolean v) {
write(v ? 1 : 0);
}
@@ -860,7 +859,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the byte value to be written.
*/
- public void writeByte(int v) {
+ public void writeByte(int v) {
write(v);
}
@@ -882,7 +881,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>short</code> value to be written.
*/
- public void writeShort(int v) {
+ public void writeShort(int v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -908,7 +907,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>char</code> value to be written.
*/
- public void writeChar(int v) {
+ public void writeChar(int v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -935,7 +934,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>int</code> value to be written.
*/
- public void writeInt(int v) {
+ public void writeInt(int v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -966,7 +965,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>long</code> value to be written.
*/
- public void writeLong(long v) {
+ public void writeLong(long v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -980,7 +979,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @return the LongUpdater that allows the long to be updated
*/
- public LongUpdater reserveLong() {
+ public LongUpdater reserveLong() {
if (this.ignoreWrites)
return null;
checkIfWritable();
@@ -1014,7 +1013,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>float</code> value to be written.
*/
- public void writeFloat(float v) {
+ public void writeFloat(float v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -1032,7 +1031,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param v the <code>double</code> value to be written.
*/
- public void writeDouble(double v) {
+ public void writeDouble(double v) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -1053,7 +1052,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param str the string of bytes to be written.
*/
- public void writeBytes(String str) {
+ public void writeBytes(String str) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -1087,7 +1086,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param s the string value to be written.
*/
- public void writeChars(String s) {
+ public void writeChars(String s) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -1157,7 +1156,7 @@ public class HeapDataOutputStream extends OutputStream
*
* @param str the string value to be written.
*/
- public void writeUTF(String str) throws UTFDataFormatException {
+ public void writeUTF(String str) throws UTFDataFormatException {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -1168,7 +1167,7 @@ public class HeapDataOutputStream extends OutputStream
}
}
- private void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException {
+ private void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException {
int strlen = str.length();
if (encodeLength && strlen > 65535) {
throw new UTFDataFormatException();
@@ -1203,7 +1202,7 @@ public class HeapDataOutputStream extends OutputStream
* The reader code should use the logic similar to DataOutputStream.readUTF() from the version
* 1.6.0_10 to decode this properly.
*/
- private void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException {
+ private void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException {
int strlen = str.length();
if (encodeLength && strlen > 65535) {
throw new UTFDataFormatException();
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
index 2f0931d..0945a10 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
@@ -304,7 +304,7 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @param str the string value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeUTF(String str) throws IOException {
+ public void writeUTF(String str) throws IOException {
int strlen = str.length();
if (strlen > 65535) {
throw new UTFDataFormatException();
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
index e5e21ef..bcaa0d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
@@ -860,7 +860,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- final boolean confirmEvictionDestroy(RegionEntry re) {
+ boolean confirmEvictionDestroy(RegionEntry re) {
// We assume here that a LRURegionMap contains LRUEntries
LRUEntry lruRe = (LRUEntry) re;
if (lruRe.isInUseByTransaction() || lruRe.isDestroyed()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 2a337ed..5dcf3bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -286,8 +286,8 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public void removeEntry(Object key, RegionEntry re, boolean updateStat,
- EntryEventImpl event, final LocalRegion owner) {
+ public void removeEntry(Object key, RegionEntry re, boolean updateStat, EntryEventImpl event,
+ final LocalRegion owner) {
boolean success = false;
if (re.isTombstone() && _getMap().get(key) == re) {
logger.fatal(
@@ -1858,8 +1858,8 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public boolean invalidate(EntryEventImpl event, boolean invokeCallbacks,
- boolean forceNewEntry, boolean forceCallbacks) throws EntryNotFoundException {
+ public boolean invalidate(EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry,
+ boolean forceCallbacks) throws EntryNotFoundException {
final boolean isDebugEnabled = logger.isDebugEnabled();
final LocalRegion owner = _getOwner();
@@ -2344,11 +2344,11 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public void txApplyInvalidate(Object key, Object newValue, boolean didDestroy,
- TransactionId txId, TXRmtEvent txEvent, boolean localOp, EventID eventId,
- Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks,
- FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext,
- TXEntryState txEntryState, VersionTag versionTag, long tailKey) {
+ public void txApplyInvalidate(Object key, Object newValue, boolean didDestroy, TransactionId txId,
+ TXRmtEvent txEvent, boolean localOp, EventID eventId, Object aCallbackArgument,
+ List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo,
+ ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag,
+ long tailKey) {
// boolean didInvalidate = false;
final LocalRegion owner = _getOwner();
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index 37974ab..886d678 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -1049,7 +1049,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
&& EvictionAction.LOCAL_DESTROY.equals(getEvictionAttributes().getAction());
}
- protected final void processPendingSecondaryExpires() {
+ protected void processPendingSecondaryExpires() {
ExpiryTask[] tasks;
while (true) {
// note we just keep looping until no more pendingExpires exist
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
index 36dc309..7624399 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
@@ -332,7 +332,7 @@ public class DiskRegion extends AbstractDiskRegion {
});
}
- public final boolean isOverflowEnabled() {
+ public boolean isOverflowEnabled() {
return this.overflowEnabled;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 7eb7697..185fde7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -2173,12 +2173,12 @@ public class EntryEventImpl
| FLAG_INHIBIT_LISTENER_NOTIFICATION | FLAG_SERIALIZATION_DEFERRED | FLAG_FROM_SERVER
| FLAG_FROM_RI_LOCAL_DESTROY | FLAG_INHIBIT_DISTRIBUTION | FLAG_REDESTROYED_TOMBSTONE);
- protected static final boolean isSet(short flags, short mask) {
+ protected static boolean isSet(short flags, short mask) {
return (flags & mask) != 0;
}
/** WARNING: Does not set the bit in place, returns new short with bit set */
- protected static final short set(short flags, short mask, boolean on) {
+ protected static short set(short flags, short mask, boolean on) {
return (short) (on ? (flags | mask) : (flags & ~mask));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
index f9b1009..4cf8f41 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
@@ -291,7 +291,7 @@ public class HARegion extends DistributedRegion {
}
@Override
- final protected boolean shouldNotifyBridgeClients() {
+ protected boolean shouldNotifyBridgeClients() {
return false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
index e475d08..c37eaa7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
@@ -335,7 +335,7 @@ public class PersistentOplogSet implements OplogSet {
}
}
- public final void recoverRegionsThatAreReady() {
+ public void recoverRegionsThatAreReady() {
// The following sync also prevents concurrent recoveries by multiple regions
// which is needed currently.
synchronized (this.alreadyRecoveredOnce) {
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
index 11afc74..2837be4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
@@ -94,8 +94,8 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
}
@Override
- protected final boolean operateOnRegion(final DistributionManager dm, LocalRegion r,
- long startTime) throws RemoteOperationException {
+ protected boolean operateOnRegion(final DistributionManager dm, LocalRegion r, long startTime)
+ throws RemoteOperationException {
if (logger.isTraceEnabled(LogMarker.DM)) {
logger.trace(LogMarker.DM, "RemoteGetMessage operateOnRegion: {}", r.getFullPath());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
index a170aef..0e9f8c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
@@ -344,9 +344,8 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
* lastModified timestamp for last modification
* @return If succeeds, return true, otherwise, throw exception
*/
- public boolean doLocalPutAll(final LocalRegion r,
- final InternalDistributedMember eventSender, long lastModified)
- throws EntryExistsException, RemoteOperationException {
+ public boolean doLocalPutAll(final LocalRegion r, final InternalDistributedMember eventSender,
+ long lastModified) throws EntryExistsException, RemoteOperationException {
final DistributedRegion dr = (DistributedRegion) r;
// create a base event and a DPAO for PutAllMessage distributed btw redundant buckets
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
index 9b57b3f..d4d4c26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
@@ -333,8 +333,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
* @param eventSender the endpoint server who received request from client
* @return If succeeds, return true, otherwise, throw exception
*/
- public boolean doLocalRemoveAll(final LocalRegion r,
- final InternalDistributedMember eventSender)
+ public boolean doLocalRemoveAll(final LocalRegion r, final InternalDistributedMember eventSender)
throws EntryExistsException, RemoteOperationException {
final DistributedRegion dr = (DistributedRegion) r;
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
index f179ab6..c14438d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
@@ -18,25 +18,16 @@ package org.apache.geode.internal.cache;
-
-
-
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
-
-
import org.apache.geode.internal.cache.lru.EnableLRU;
-
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-
import org.apache.geode.internal.InternalStatisticsDisabledException;
-
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
@@ -61,7 +52,7 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEntryHeap {
- public VMStatsDiskLRURegionEntryHeapIntKey (RegionEntryContext context, int key,
+ public VMStatsDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
@@ -69,40 +60,41 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
- ) {
- super(context,
+ ) {
+ super(context,
- (value instanceof RecoveredEntry ? null : value)
+ (value instanceof RecoveredEntry ? null : value)
- );
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
initialize(context, value);
-
this.key = key;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@SuppressWarnings("unused")
private volatile long lastModified;
- private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> lastModifiedUpdater
- = AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "lastModified");
+ private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> lastModifiedUpdater =
+ AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "lastModified");
private volatile Object value;
+
@Override
protected Object getValueField() {
return this.value;
}
+
@Override
protected void setValueField(Object v) {
this.value = v;
@@ -111,24 +103,29 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
protected long getLastModifiedField() {
return lastModifiedUpdater.get(this);
}
+
protected boolean compareAndSetLastModifiedField(long expectedValue, long newValue) {
return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
}
+
/**
* @see HashEntry#getEntryHash()
*/
public int getEntryHash() {
return this.hash;
}
+
protected void setEntryHash(int v) {
this.hash = v;
}
+
/**
* @see HashEntry#getNextEntry()
*/
public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
+
/**
* @see HashEntry#setNextEntry
*/
@@ -138,13 +135,13 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// disk code
protected void initialize(RegionEntryContext drs, Object value) {
boolean isBackup;
if (drs instanceof LocalRegion) {
- isBackup = ((LocalRegion)drs).getDiskRegion().isBackup();
+ isBackup = ((LocalRegion) drs).getDiskRegion().isBackup();
} else if (drs instanceof PlaceHolderDiskRegion) {
isBackup = true;
} else {
@@ -155,10 +152,11 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
diskInitialize(drs, value);
}
}
+
@Override
public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
- int newSize = capacityController.entrySize( getKeyForSizing(), null);
+ int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
int delta = newSize - oldSize;
return delta;
@@ -166,12 +164,12 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
private void diskInitialize(RegionEntryContext context, Object value) {
- DiskRecoveryStore drs = (DiskRecoveryStore)context;
+ DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
- //get appropriate instance of DiskId implementation based on maxOplogSize
+ // get appropriate instance of DiskId implementation based on maxOplogSize
this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, ds.needsLinkedList());
Helper.initialize(this, drs, value);
}
@@ -181,58 +179,60 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
*
* @since GemFire 5.1
*/
- protected DiskId id;//= new DiskId();
+ protected DiskId id;// = new DiskId();
+
public DiskId getDiskId() {
return this.id;
}
+
@Override
void setDiskId(RegionEntry old) {
- this.id = ((AbstractDiskRegionEntry)old).getDiskId();
- }
-// // inlining DiskId
-// // always have these fields
-// /**
-// * id consists of
-// * most significant
-// * 1 byte = users bits
-// * 2-8 bytes = oplog id
-// * least significant.
-// *
-// * The highest bit in the oplog id part is set to 1 if the oplog id
-// * is negative.
-// * @todo this field could be an int for an overflow only region
-// */
-// private long id;
-// /**
-// * Length of the bytes on disk.
-// * This is always set. If the value is invalid then it will be set to 0.
-// * The most significant bit is used by overflow to mark it as needing to be written.
-// */
-// protected int valueLength = 0;
-// // have intOffset or longOffset
-// // intOffset
-// /**
-// * The position in the oplog (the oplog offset) where this entry's value is
-// * stored
-// */
-// private volatile int offsetInOplog;
-// // longOffset
-// /**
-// * The position in the oplog (the oplog offset) where this entry's value is
-// * stored
-// */
-// private volatile long offsetInOplog;
-// // have overflowOnly or persistence
-// // overflowOnly
-// // no fields
-// // persistent
-// /** unique entry identifier * */
-// private long keyId;
-
-
+ this.id = ((AbstractDiskRegionEntry) old).getDiskId();
+ }
+ // // inlining DiskId
+ // // always have these fields
+ // /**
+ // * id consists of
+ // * most significant
+ // * 1 byte = users bits
+ // * 2-8 bytes = oplog id
+ // * least significant.
+ // *
+ // * The highest bit in the oplog id part is set to 1 if the oplog id
+ // * is negative.
+ // * @todo this field could be an int for an overflow only region
+ // */
+ // private long id;
+ // /**
+ // * Length of the bytes on disk.
+ // * This is always set. If the value is invalid then it will be set to 0.
+ // * The most significant bit is used by overflow to mark it as needing to be written.
+ // */
+ // protected int valueLength = 0;
+ // // have intOffset or longOffset
+ // // intOffset
+ // /**
+ // * The position in the oplog (the oplog offset) where this entry's value is
+ // * stored
+ // */
+ // private volatile int offsetInOplog;
+ // // longOffset
+ // /**
+ // * The position in the oplog (the oplog offset) where this entry's value is
+ // * stored
+ // */
+ // private volatile long offsetInOplog;
+ // // have overflowOnly or persistence
+ // // overflowOnly
+ // // no fields
+ // // persistent
+ // /** unique entry identifier * */
+ // private long keyId;
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
@@ -244,36 +244,44 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
+
public synchronized int updateEntrySize(EnableLRU capacityController) {
- return updateEntrySize(capacityController, _getValue()); // OFHEAP: _getValue ok w/o incing refcount because we are synced and only getting the size
+ return updateEntrySize(capacityController, _getValue()); // OFHEAP: _getValue ok w/o incing
+ // refcount because we are synced and
+ // only getting the size
}
-
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
- public synchronized int updateEntrySize(EnableLRU capacityController,
- Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
- int newSize = capacityController.entrySize( getKeyForSizing(), value);
+ int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
return delta;
}
+
public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
+
@Override
public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
+
public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
+
public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
+
public void setEvicted() {
setBits(EVICTED);
}
+
public void unsetEvicted() {
clearBits(~EVICTED);
}
@@ -283,33 +291,38 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public void setNextLRUNode( LRUClockNode next ) {
+
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
+
public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public void setPrevLRUNode( LRUClockNode prev ) {
+
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
+
public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
+
public int getEntrySize() {
return this.size;
}
+
protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
@Override
public Object getKeyForSizing() {
-
// inline keys always report null for sizing since the size comes from the entry size
return null;
@@ -318,7 +331,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// stats code
@Override
public void updateStatsForGet(boolean hit, long time) {
@@ -329,51 +342,59 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
incrementMissCount();
}
}
+
@Override
protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
- if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+ if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
}
}
+
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
-
- private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> hitCountUpdater
- = AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "hitCount");
- private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> missCountUpdater
- = AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "missCount");
-
+
+ private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> hitCountUpdater =
+ AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "hitCount");
+ private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> missCountUpdater =
+ AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "missCount");
+
@Override
public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
+
private void setLastAccessed(long lastAccessed) {
this.lastAccessed = lastAccessed;
}
+
@Override
public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
+
@Override
public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
+
private void incrementHitCount() {
hitCountUpdater.incrementAndGet(this);
}
+
private void incrementMissCount() {
missCountUpdater.incrementAndGet(this);
}
+
@Override
public void resetCounts() throws InternalStatisticsDisabledException {
- hitCountUpdater.set(this,0);
- missCountUpdater.set(this,0);
+ hitCountUpdater.set(this, 0);
+ missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
@Override
public void txDidDestroy(long currTime) {
setLastModified(currTime);
@@ -381,30 +402,27 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
this.hitCount = 0;
this.missCount = 0;
}
+
@Override
public boolean hasStats() {
return true;
}
-
-
-
- // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
- // key code
-
-
+ // DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+ // key code
private final int key;
+
@Override
public Object getKey() {
return this.key;
}
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof Integer) {
@@ -412,7 +430,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
return false;
}
-
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5adb681a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
index 67bf7d4..a41f02b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
@@ -18,25 +18,16 @@ package org.apache.geode.internal.cache;
-
-
-
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
-
-
import org.apache.geode.internal.cache.lru.EnableLRU;
-
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-
import org.apache.geode.internal.InternalStatisticsDisabledException;
-
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
@@ -61,7 +52,7 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEntryHeap {
- public VMStatsDiskLRURegionEntryHeapLongKey (RegionEntryContext context, long key,
+ public VMStatsDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
@@ -69,42 +60,41 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
- ) {
- super(context,
+ ) {
+ super(context,
- (value instanceof RecoveredEntry ? null : value)
+ (value instanceof RecoveredEntry ? null : value)
- );
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
initialize(context, value);
-
-
-
this.key = key;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@SuppressWarnings("unused")
private volatile long lastModified;
- private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> lastModifiedUpdater
- = AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "lastModified");
+ private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> lastModifiedUpdater =
+ AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "lastModified");
private volatile Object value;
+
@Override
protected Object getValueField() {
return this.value;
}
+
@Override
protected void setValueField(Object v) {
this.value = v;
@@ -113,24 +103,29 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
protected long getLastModifiedField() {
return lastModifiedUpdater.get(this);
}
+
protected boolean compareAndSetLastModifiedField(long expectedValue, long newValue) {
return lastModifiedUpdater.compareAndSet(this, expectedValue, newValue);
}
+
/**
* @see HashEntry#getEntryHash()
*/
public int getEntryHash() {
return this.hash;
}
+
protected void setEntryHash(int v) {
this.hash = v;
}
+
/**
* @see HashEntry#getNextEntry()
*/
public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
+
/**
* @see HashEntry#setNextEntry
*/
@@ -140,13 +135,13 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// disk code
protected void initialize(RegionEntryContext drs, Object value) {
boolean isBackup;
if (drs instanceof LocalRegion) {
- isBackup = ((LocalRegion)drs).getDiskRegion().isBackup();
+ isBackup = ((LocalRegion) drs).getDiskRegion().isBackup();
} else if (drs instanceof PlaceHolderDiskRegion) {
isBackup = true;
} else {
@@ -157,10 +152,11 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
diskInitialize(drs, value);
}
}
+
@Override
public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
- int newSize = capacityController.entrySize( getKeyForSizing(), null);
+ int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
int delta = newSize - oldSize;
return delta;
@@ -168,12 +164,12 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
private void diskInitialize(RegionEntryContext context, Object value) {
- DiskRecoveryStore drs = (DiskRecoveryStore)context;
+ DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
- //get appropriate instance of DiskId implementation based on maxOplogSize
+ // get appropriate instance of DiskId implementation based on maxOplogSize
this.id = DiskId.createDiskId(maxOplogSize, true/* is persistence */, ds.needsLinkedList());
Helper.initialize(this, drs, value);
}
@@ -183,58 +179,60 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
*
* @since GemFire 5.1
*/
- protected DiskId id;//= new DiskId();
+ protected DiskId id;// = new DiskId();
+
public DiskId getDiskId() {
return this.id;
}
+
@Override
void setDiskId(RegionEntry old) {
- this.id = ((AbstractDiskRegionEntry)old).getDiskId();
- }
-// // inlining DiskId
-// // always have these fields
-// /**
-// * id consists of
-// * most significant
-// * 1 byte = users bits
-// * 2-8 bytes = oplog id
-// * least significant.
-// *
-// * The highest bit in the oplog id part is set to 1 if the oplog id
-// * is negative.
-// * @todo this field could be an int for an overflow only region
-// */
-// private long id;
-// /**
-// * Length of the bytes on disk.
-// * This is always set. If the value is invalid then it will be set to 0.
-// * The most significant bit is used by overflow to mark it as needing to be written.
-// */
-// protected int valueLength = 0;
-// // have intOffset or longOffset
-// // intOffset
-// /**
-// * The position in the oplog (the oplog offset) where this entry's value is
-// * stored
-// */
-// private volatile int offsetInOplog;
-// // longOffset
-// /**
-// * The position in the oplog (the oplog offset) where this entry's value is
-// * stored
-// */
-// private volatile long offsetInOplog;
-// // have overflowOnly or persistence
-// // overflowOnly
-// // no fields
-// // persistent
-// /** unique entry identifier * */
-// private long keyId;
-
-
+ this.id = ((AbstractDiskRegionEntry) old).getDiskId();
+ }
+ // // inlining DiskId
+ // // always have these fields
+ // /**
+ // * id consists of
+ // * most significant
+ // * 1 byte = users bits
+ // * 2-8 bytes = oplog id
+ // * least significant.
+ // *
+ // * The highest bit in the oplog id part is set to 1 if the oplog id
+ // * is negative.
+ // * @todo this field could be an int for an overflow only region
+ // */
+ // private long id;
+ // /**
+ // * Length of the bytes on disk.
+ // * This is always set. If the value is invalid then it will be set to 0.
+ // * The most significant bit is used by overflow to mark it as needing to be written.
+ // */
+ // protected int valueLength = 0;
+ // // have intOffset or longOffset
+ // // intOffset
+ // /**
+ // * The position in the oplog (the oplog offset) where this entry's value is
+ // * stored
+ // */
+ // private volatile int offsetInOplog;
+ // // longOffset
+ // /**
+ // * The position in the oplog (the oplog offset) where this entry's value is
+ // * stored
+ // */
+ // private volatile long offsetInOplog;
+ // // have overflowOnly or persistence
+ // // overflowOnly
+ // // no fields
+ // // persistent
+ // /** unique entry identifier * */
+ // private long keyId;
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
@@ -246,36 +244,44 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
+
public synchronized int updateEntrySize(EnableLRU capacityController) {
- return updateEntrySize(capacityController, _getValue()); // OFHEAP: _getValue ok w/o incing refcount because we are synced and only getting the size
+ return updateEntrySize(capacityController, _getValue()); // OFHEAP: _getValue ok w/o incing
+ // refcount because we are synced and
+ // only getting the size
}
-
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
- public synchronized int updateEntrySize(EnableLRU capacityController,
- Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
- int newSize = capacityController.entrySize( getKeyForSizing(), value);
+ int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
return delta;
}
+
public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
+
@Override
public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
+
public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
+
public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
+
public void setEvicted() {
setBits(EVICTED);
}
+
public void unsetEvicted() {
clearBits(~EVICTED);
}
@@ -285,33 +291,38 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public void setNextLRUNode( LRUClockNode next ) {
+
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
+
public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public void setPrevLRUNode( LRUClockNode prev ) {
+
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
+
public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
+
public int getEntrySize() {
return this.size;
}
+
protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
@Override
public Object getKeyForSizing() {
-
// inline keys always report null for sizing since the size comes from the entry size
return null;
@@ -320,7 +331,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// stats code
@Override
public void updateStatsForGet(boolean hit, long time) {
@@ -331,51 +342,59 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
incrementMissCount();
}
}
+
@Override
protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
- if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
+ if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
}
}
+
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
-
- private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> hitCountUpdater
- = AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "hitCount");
- private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> missCountUpdater
- = AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "missCount");
-
+
+ private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> hitCountUpdater =
+ AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "hitCount");
+ private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> missCountUpdater =
+ AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "missCount");
+
@Override
public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
+
private void setLastAccessed(long lastAccessed) {
this.lastAccessed = lastAccessed;
}
+
@Override
public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
+
@Override
public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
+
private void incrementHitCount() {
hitCountUpdater.incrementAndGet(this);
}
+
private void incrementMissCount() {
missCountUpdater.incrementAndGet(this);
}
+
@Override
public void resetCounts() throws InternalStatisticsDisabledException {
- hitCountUpdater.set(this,0);
- missCountUpdater.set(this,0);
+ hitCountUpdater.set(this, 0);
+ missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
@Override
public void txDidDestroy(long currTime) {
setLastModified(currTime);
@@ -383,23 +402,25 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
this.hitCount = 0;
this.missCount = 0;
}
+
@Override
public boolean hasStats() {
return true;
}
-
-
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-
+
// key code
private final long key;
+
@Override
public Object getKey() {
return this.key;
}
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof Long) {
@@ -407,7 +428,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
return false;
}
-
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}